diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
| commit | bacecf80ea16d3cd30dc7c98c98af013b2adc258 (patch) | |
| tree | 2b1d6f48708ace28ae4f6c9893ee50f6f390c6b7 /templates/system/domain-name | |
| parent | 0d8e75e2e808ccf366a1527647a6353c09d92237 (diff) | |
| parent | 0f19dc57ed6588c083eee8aa9aee09b92b441b08 (diff) | |
| download | vyatta-cfg-system-lithium.tar.gz vyatta-cfg-system-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
debian/changelog
scripts/snmp/vyatta-snmp-v3.pl
scripts/snmp/vyatta-snmp.pl
templates/interfaces/tunnel/node.def
templates/system/sysctl/custom/node.def
Diffstat (limited to 'templates/system/domain-name')
| -rw-r--r-- | templates/system/domain-name/node.def | 12 |
1 files changed, 0 insertions, 12 deletions
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 |