Migrate sysconf files to vyos-1x

6 files changed, 0 insertions, 181 deletions

diff --git a/Makefile.am b/Makefile.am
index 7bbf0487..fe279797 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,11 +49,7 @@ share_perl5_DATA =
 share_perl5_DATA += scripts/XorpConfigParser.pm
 
 sysconf_DATA += sysconf/LICENSE
-sysconf_DATA += sysconf/rsyslog.conf
-sysconf_DATA += sysconf/securetty
-sysconf_DATA += sysconf/level
 sysconf_DATA += sysconf/filecaps
-sysconf_DATA += sysconf/capability.conf
 sysconf_DATA += sysconf/netdevice
 
 libudevdir = /lib/udev
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 6a5c830c..3d5b222f 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -122,21 +122,6 @@ ln -sf /dev/null /lib/systemd/system/ctrl-alt-del.target
 # this logs unnecessary messages trying to start ddclient
 rm -f /etc/ppp/ip-up.d/ddclient
 
-# remove old init that should have been cleaned up during upgrade but isn't
-if [ -f /etc/init.d/vyatta-ofr ]; then
-    update-rc.d -f /etc/init.d/vyatta-ofr remove
-    rm -f /etc/init.d/vyatta-ofr
-fi
-
-# comply with Squeeze version of modprobe
-# remove old versions of files during upgrade
-for modprobe in vyatta_blacklist_ipv6 vyatta_disable_ipv6
-do
-  if [ -f /etc/modprobe.d/${modprobe} ]; then
-      mv -f /etc/modprobe.d/${modprobe} /etc/modprobe.d/${modprobe}.conf
-  fi
-done
-
 # add vyatta-config-reboot-params to start at boot up
 update-rc.d vyatta-config-reboot-params start 20 S
 
diff --git a/sysconf/capability.conf b/sysconf/capability.conf
deleted file mode 100644
index 0a7235f1..00000000
--- a/sysconf/capability.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# this is a capability file (used in conjunction with the pam_cap.so module)
-
-# Special capability for Vyatta admin
-all %vyattacfg
-
-# Vyatta Operator
-cap_net_admin,cap_sys_boot,cap_audit_write	%vyattaop
-
-## 'everyone else' gets no inheritable capabilities
-none  *
diff --git a/sysconf/level b/sysconf/level
deleted file mode 100644
index ecc8c487..00000000
--- a/sysconf/level
+++ /dev/null
@@ -1,2 +0,0 @@
-admin:frrvty,vyattacfg,sudo,adm,dip,disk
-operator:frrvty,vyattaop,operator,adm,dip
diff --git a/sysconf/rsyslog.conf b/sysconf/rsyslog.conf
deleted file mode 100644
index 76424722..00000000
--- a/sysconf/rsyslog.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#  /etc/rsyslog.conf	Configuration file for rsyslog.
-#
-#			For more information see
-#			/usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
-
-
-#################
-#### MODULES ####
-#################
-
-$ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
-#$ModLoad immark  # provides --MARK-- message capability
-
-$OmitLocalLogging off
-$SystemLogSocketName /run/systemd/journal/syslog
-
-$KLogPath /proc/kmsg
-
-# provides UDP syslog reception
-#$ModLoad imudp
-#$UDPServerRun 514
-
-# provides TCP syslog reception
-#$ModLoad imtcp
-#$InputTCPServerRun 514
-
-
-###########################
-#### GLOBAL DIRECTIVES ####
-###########################
-
-#
-# Use traditional timestamp format.
-# To enable high precision timestamps, comment out the following line.
-#
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# Filter duplicated messages
-$RepeatedMsgReduction on
-
-#
-# Set the default permissions for all log files.
-#
-$FileOwner root
-$FileGroup adm
-$FileCreateMode 0640
-$DirCreateMode 0755
-$Umask 0022
-
-#
-# Include all config files in /etc/rsyslog.d/
-#
-$IncludeConfig /etc/rsyslog.d/*.conf
-
-###############
-#### RULES ####
-###############
-
-daemon.*            /var/log/messages
-
-# Log authorization failure messages
-auth,authpriv.*			/var/log/auth.log
-
-# Emergencies are sent to everybody logged in.
-*.emerg				:omusrmsg:*
-
diff --git a/sysconf/securetty b/sysconf/securetty
deleted file mode 100644
index 17d8610a..00000000
--- a/sysconf/securetty
+++ /dev/null
@@ -1,83 +0,0 @@
-# /etc/securetty: list of terminals on which root is allowed to login.
-# See securetty(5) and login(1).
-console
-
-# Standard serial ports
-ttyS0
-ttyS1
-
-# USB dongles
-ttyUSB0
-ttyUSB1
-ttyUSB2
-
-# Standard hypervisor virtual console
-hvc0
-
-# Oldstyle Xen console
-xvc0
-
-# Standard consoles
-tty1
-tty2
-tty3
-tty4
-tty5
-tty6
-tty7
-tty8
-tty9
-tty10
-tty11
-tty12
-tty13
-tty14
-tty15
-tty16
-tty17
-tty18
-tty19
-tty20
-tty21
-tty22
-tty23
-tty24
-tty25
-tty26
-tty27
-tty28
-tty29
-tty30
-tty31
-tty32
-tty33
-tty34
-tty35
-tty36
-tty37
-tty38
-tty39
-tty40
-tty41
-tty42
-tty43
-tty44
-tty45
-tty46
-tty47
-tty48
-tty49
-tty50
-tty51
-tty52
-tty53
-tty54
-tty55
-tty56
-tty57
-tty58
-tty59
-tty60
-tty61
-tty62
-tty63