T671: cleanup rl-system and move components to better suited locations

- CHanging sysctl values should be done by out generic file
  /etc/sysctl.d/30-vyatta-router.conf
- NTP config must not be restored from from /opt as it is entirely
  rendered from scratch.

(cherry picked from commit b74daed7c3d2e302426fd5c6ace7e299d4278ca0)

4 files changed, 3 insertions, 39 deletions

diff --git a/Makefile.am b/Makefile.am
index c5f7dfac..adea19a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,6 @@ sysconf_DATA += sysconf/issue
 sysconf_DATA += sysconf/issue.net
 sysconf_DATA += sysconf/motd.tail
 sysconf_DATA += sysconf/rsyslog.conf
-sysconf_DATA += sysconf/ntp.conf
 sysconf_DATA += sysconf/default_ssh
 sysconf_DATA += sysconf/securetty
 sysconf_DATA += sysconf/vyatta-sysctl.conf
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index a481e63b..a42f115b 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -128,9 +128,6 @@ set_ipv6_params ()
 	return
     fi
 
-    # Enable forwarding
-    echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
-
     # Increase route table limit
     echo 262144 >/proc/sys/net/ipv6/route/max_size
 
@@ -144,16 +141,6 @@ set_ipv6_params ()
     done
 }
 
-setup_ntp_config_file () {
-    template_ntp_conf=/opt/vyatta/etc/ntp.conf
-    if [ -e $template_ntp_conf ]; then
-	cp -f $template_ntp_conf /etc/ntp.conf
-    else
-	log_failure_msg "NTP template config file doesn\'t exist"
-    fi
-}
-
-
 # These are all the default security setting which are later
 # overridden when configuration is read. These are the values the
 # system defaults.
@@ -186,7 +173,6 @@ start () {
 	log_failure_msg "can't initialize ssh host keys"
     clear_or_override_config_files || \
 	log_failure_msg "can\'t reset config files"
-    setup_ntp_config_file
 
     add_new_serial_if || \
 	log_failure_msg "can\'t add serial interfaces"
diff --git a/sysconf/ntp.conf b/sysconf/ntp.conf
deleted file mode 100644
index 855d5097..00000000
--- a/sysconf/ntp.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
-
-# This configuration file is automatically generated by the Vyatta
-# configuration subsystem.  Please do not manually edit it.
-#
-# The first section of this file consists of static parameters
-# (that can not be changed via the VyOS CLI) and default values
-# that prevent ntpd being queried (client only mode).
-#
-
-driftfile /var/lib/ntp/ntp.drift
-
-# By default, only allow ntpd to query time sources, ignore any
-# incoming requests.
-
-restrict default ignore
-restrict -6 default ignore
-
-# Local users have unrestricted access, allowing reconfiguration
-# via ntpdc
-restrict 127.0.0.1
-restrict -6 ::1
-
-# VyOS CLI configuration options
diff --git a/sysconf/vyatta-sysctl.conf b/sysconf/vyatta-sysctl.conf
index 0314fcc5..01ae92f8 100644
--- a/sysconf/vyatta-sysctl.conf
+++ b/sysconf/vyatta-sysctl.conf
@@ -71,6 +71,9 @@ net.ipv4.conf.all.send_redirects=1
 # Increase size of buffer for netlink
 net.core.rmem_max=2097152
 
+# Enable packet forwarding for IPv6
+net.ipv6.conf.all.forwarding=1
+
 # Do not forget IPv6 addresses when a link goes down
 net.ipv6.conf.default.keep_addr_on_down=1
 net.ipv6.conf.all.keep_addr_on_down=1