summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-05-16 06:41:40 +0200
committerDaniil Baturin <daniil@baturin.org>2018-05-16 06:41:40 +0200
commitea256dc7956a3fbe5947c0ad9da9e90dd2320327 (patch)
treea9faad8eccedf2030f6e23a69f8a4e41b4958eff
parent413d89862ad9bea7d31200eb7a29bd0dd7fca214 (diff)
downloadvyatta-cfg-system-ea256dc7956a3fbe5947c0ad9da9e90dd2320327.tar.gz
vyatta-cfg-system-ea256dc7956a3fbe5947c0ad9da9e90dd2320327.zip
T574: remove the old system host-name/domain-name commands, moving to vyos-1x.
-rwxr-xr-xscripts/system/vyatta_update_hosts.pl114
-rw-r--r--templates/system/domain-name/node.def12
-rw-r--r--templates/system/host-name/node.def12
3 files changed, 0 insertions, 138 deletions
diff --git a/scripts/system/vyatta_update_hosts.pl b/scripts/system/vyatta_update_hosts.pl
deleted file mode 100755
index 22b141ab..00000000
--- a/scripts/system/vyatta_update_hosts.pl
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Module: vyatta_update_hosts.pl
-#
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2012-2013 Vyatta, Inc.
-# All Rights Reserved.
-#
-# Description:
-# Script to update '/etc/hosts' on commit of 'system host-name' and
-# 'system domain-name' config.
-#
-# **** End License ****
-#
-
-use strict;
-use English;
-use lib "/opt/vyatta/share/perl5/";
-
-use File::Temp qw(tempfile);
-use Vyatta::File qw(touch);
-use Vyatta::Config;
-use Getopt::Long;
-
-my $HOSTS_CFG = '/etc/hosts';
-my $HOSTS_TMPL = "/tmp/hosts.XXXXXX";
-my $HOSTNAME_CFG = '/etc/hostname';
-my $MAILNAME_CFG = '/etc/mailname';
-my $restart_services = 1;
-
-sub set_hostname {
- my ( $hostname ) = @_;
- system("hostname $hostname");
- open (my $f, '>', $HOSTNAME_CFG)
- or die("$0: Error! Unable to open $HOSTNAME_CFG for output: $!\n");
- print $f "$hostname\n";
- close ($f);
-}
-
-sub set_mailname {
- my ( $mailname ) = @_;
- open (my $f, '>', $MAILNAME_CFG)
- or die("$0: Error! Unable to open $MAILNAME_CFG for output: $!\n");
- print $f "$mailname\n";
- close ($f);
-}
-
-if ($EUID != 0) {
- printf("This program must be run by root.\n");
- exit 1;
-}
-
-GetOptions("restart-services!" => \$restart_services);
-
-my $vc = new Vyatta::Config();
-
-$vc->setLevel('system');
-my $host_name = $vc->returnValue('host-name');
-my $domain_name = $vc->returnValue('domain-name');
-my $mail_name;
-my $hosts_line = "127.0.1.1\t ";
-
-if (! defined $host_name) {
- $host_name = 'vyatta';
-}
-$mail_name = $host_name;
-
-if (defined $domain_name) {
- $mail_name .= '.' . $domain_name;
- $hosts_line .= $host_name . '.' . $domain_name;
-}
-$hosts_line .= " $host_name\t #vyatta entry\n";
-
-my ($out, $tempname) = tempfile($HOSTS_TMPL, UNLINK => 1)
- or die "Can't create temp file: $!";
-
-if (! -e $HOSTS_CFG) {
- touch $HOSTS_CFG;
-}
-open (my $in, '<', $HOSTS_CFG)
- or die("$0: Error! Unable to open '$HOSTS_CFG' for input: $!\n");
-
-while (my $line = <$in>) {
- if ($line =~ m:^127.0.1.1:) {
- next;
- }
- print $out $line;
-}
-print $out $hosts_line;
-
-close ($in);
-close ($out);
-
-system("cp $tempname $HOSTS_CFG") == 0
- or die "Can't copy $tempname to $HOSTS_CFG: $!";
-
-set_hostname $host_name;
-set_mailname $mail_name;
-
-# Restart services that use the system hostname;
-# add more ase needed.
-if ($restart_services) {
- system("invoke-rc.d rsyslog restart");
-}
diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def
deleted file mode 100644
index 4866ddf8..00000000
--- a/templates/system/domain-name/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-priority: 400
-type: txt
-help: System domain name
-
-# Allow letter-number-hyphen in label (but can not start or end with hyphen)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_domainname.pl $VAR(../host-name).$VAR(@)"
-
-update: sudo /opt/vyatta/sbin/vyatta_update_resolv.pl
- sudo /opt/vyatta/sbin/vyatta_update_hosts.pl --no-restart-services
-
-delete: sudo /opt/vyatta/sbin/vyatta_update_resolv.pl
- sudo /opt/vyatta/sbin/vyatta_update_hosts.pl --no-restart-services
diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def
deleted file mode 100644
index 00798bef..00000000
--- a/templates/system/host-name/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-priority: 100
-type: txt
-help: System host name (default: vyos)
-default: "vyos"
-syntax:expression: pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$"
- ; "invalid host name $VAR(@)"
-
-syntax:expression: pattern $VAR(@) "^.{1,63}$" ; "invalid host-name length"
-
-update: sudo /opt/vyatta/sbin/vyatta_update_hosts.pl
-
-delete: sudo /opt/vyatta/sbin/vyatta_update_hosts.pl