]> git.hoellein.online Git - vserver2/commitdiff
committing changes in /etc after apt run
authormhoellein <mario@hoellein.online>
Tue, 21 May 2019 09:00:30 +0000 (11:00 +0200)
committermhoellein <mario@hoellein.online>
Tue, 21 May 2019 09:00:30 +0000 (11:00 +0200)
Package changes:
-apache2 2.4.34-1ubuntu2 amd64
-apache2-bin 2.4.34-1ubuntu2 amd64
-apache2-data 2.4.34-1ubuntu2 all
-apache2-utils 2.4.34-1ubuntu2 amd64
+apache2 2.4.34-1ubuntu2.1 amd64
+apache2-bin 2.4.34-1ubuntu2.1 amd64
+apache2-data 2.4.34-1ubuntu2.1 all
+apache2-utils 2.4.34-1ubuntu2.1 amd64
-apt 1.7.2 amd64
+apt 1.7.4 amd64
-apt-transport-https 1.7.2 all
-apt-utils 1.7.2 amd64
+apt-transport-https 1.7.4 all
+apt-utils 1.7.4 amd64
-bind9 1:9.11.4+dfsg-3ubuntu5.1 amd64
-bind9-host 1:9.11.4+dfsg-3ubuntu5.1 amd64
-bind9utils 1:9.11.4+dfsg-3ubuntu5.1 amd64
+bind9 1:9.11.4+dfsg-3ubuntu5.3 amd64
+bind9-host 1:9.11.4+dfsg-3ubuntu5.3 amd64
+bind9utils 1:9.11.4+dfsg-3ubuntu5.3 amd64
-busybox-initramfs 1:1.27.2-2ubuntu4 amd64
-busybox-static 1:1.27.2-2ubuntu4 amd64
+busybox-initramfs 1:1.27.2-2ubuntu4.1 amd64
+busybox-static 1:1.27.2-2ubuntu4.1 amd64
-console-setup 1.178ubuntu9 all
-console-setup-linux 1.178ubuntu9 all
+console-setup 1.178ubuntu9.2 all
+console-setup-linux 1.178ubuntu9.2 all
-debconf 1.5.69 all
-debconf-i18n 1.5.69 all
+debconf 1.5.69ubuntu1 all
+debconf-i18n 1.5.69ubuntu1 all
-distro-info-data 0.38ubuntu0.1 all
+distro-info-data 0.38ubuntu0.4 all
-dnsutils 1:9.11.4+dfsg-3ubuntu5.1 amd64
+dnsutils 1:9.11.4+dfsg-3ubuntu5.3 amd64
-file 1:5.34-2 amd64
+file 1:5.34-2ubuntu0.1 amd64
-gcc-8-base 8.2.0-7ubuntu1 amd64
+gcc-8-base 8.3.0-6ubuntu1~18.10 amd64
-grub-common 2.02+dfsg1-5ubuntu8.2 amd64
+grub-common 2.02+dfsg1-5ubuntu8.3 amd64
-grub-pc 2.02+dfsg1-5ubuntu8.2 amd64
-grub-pc-bin 2.02+dfsg1-5ubuntu8.2 amd64
-grub2-common 2.02+dfsg1-5ubuntu8.2 amd64
+grub-pc 2.02+dfsg1-5ubuntu8.3 amd64
+grub-pc-bin 2.02+dfsg1-5ubuntu8.3 amd64
+grub2-common 2.02+dfsg1-5ubuntu8.3 amd64
-intel-microcode 3.20180807a.1 amd64
+intel-microcode 3.20190514.0ubuntu0.18.10.1 amd64
-isc-dhcp-client 4.3.5-3ubuntu9 amd64
-isc-dhcp-common 4.3.5-3ubuntu9 amd64
+isc-dhcp-client 4.3.5-3ubuntu9.1 amd64
+isc-dhcp-common 4.3.5-3ubuntu9.1 amd64
-keyboard-configuration 1.178ubuntu9 all
+keyboard-configuration 1.178ubuntu9.2 all
-libapache2-mod-php7.2 7.2.15-0ubuntu0.18.10.1 amd64
+libapache2-mod-php7.2 7.2.17-0ubuntu0.18.10.1 amd64
-libapt-inst2.0 1.7.2 amd64
+libapt-inst2.0 1.7.4 amd64
-libapt-pkg5.0 1.7.2 amd64
+libapt-pkg5.0 1.7.4 amd64
-libbind9-160 1:9.11.4+dfsg-3ubuntu5.1 amd64
+libbind9-160 1:9.11.4+dfsg-3ubuntu5.3 amd64
-libdns-export1102 1:9.11.4+dfsg-3ubuntu5.1 amd64
-libdns1102 1:9.11.4+dfsg-3ubuntu5.1 amd64
+libdns-export1102 1:9.11.4+dfsg-3ubuntu5.3 amd64
+libdns1102 1:9.11.4+dfsg-3ubuntu5.3 amd64
-libgcc1 1:8.2.0-7ubuntu1 amd64
+libgcc1 1:8.3.0-6ubuntu1~18.10 amd64
-libgd3 2.2.5-4ubuntu1 amd64
+libgd3 2.2.5-4ubuntu1.1 amd64
-libgomp1 8.2.0-7ubuntu1 amd64
+libgomp1 8.3.0-6ubuntu1~18.10 amd64
-libidn11 1.33-2.2ubuntu1 amd64
+libidn11 1.33-2.2ubuntu1.1 amd64
-libirs160 1:9.11.4+dfsg-3ubuntu5.1 amd64
-libisc-export169 1:9.11.4+dfsg-3ubuntu5.1 amd64
-libisc169 1:9.11.4+dfsg-3ubuntu5.1 amd64
-libisccc160 1:9.11.4+dfsg-3ubuntu5.1 amd64
-libisccfg160 1:9.11.4+dfsg-3ubuntu5.1 amd64
+libirs160 1:9.11.4+dfsg-3ubuntu5.3 amd64
+libisc-export169 1:9.11.4+dfsg-3ubuntu5.3 amd64
+libisc169 1:9.11.4+dfsg-3ubuntu5.3 amd64
+libisccc160 1:9.11.4+dfsg-3ubuntu5.3 amd64
+libisccfg160 1:9.11.4+dfsg-3ubuntu5.3 amd64
-libldap-2.4-2 2.4.46+dfsg-5ubuntu1.1 amd64
-libldap-common 2.4.46+dfsg-5ubuntu1.1 all
+libldap-2.4-2 2.4.46+dfsg-5ubuntu1.2 amd64
+libldap-common 2.4.46+dfsg-5ubuntu1.2 all
-liblwres160 1:9.11.4+dfsg-3ubuntu5.1 amd64
+liblwres160 1:9.11.4+dfsg-3ubuntu5.3 amd64
-libmagic-mgc 1:5.34-2 amd64
-libmagic1 1:5.34-2 amd64
+libmagic-mgc 1:5.34-2ubuntu0.1 amd64
+libmagic1 1:5.34-2ubuntu0.1 amd64
-libmysqlclient20 5.7.25-0ubuntu0.18.10.2 amd64
+libmysqlclient20 5.7.26-0ubuntu0.18.10.1 amd64
-libnss-systemd 239-7ubuntu10.8 amd64
-libntfs-3g88 1:2017.3.23-2 amd64
+libnss-systemd 239-7ubuntu10.13 amd64
+libntfs-3g88 1:2017.3.23-2ubuntu0.18.10.2 amd64
-libnuma1 2.0.11-2.2 amd64
+libnuma1 2.0.11-2.2ubuntu0.1 amd64
-libpam-modules 1.1.8-3.6ubuntu2 amd64
-libpam-modules-bin 1.1.8-3.6ubuntu2 amd64
-libpam-runtime 1.1.8-3.6ubuntu2 all
-libpam-systemd 239-7ubuntu10.8 amd64
-libpam0g 1.1.8-3.6ubuntu2 amd64
+libpam-modules 1.1.8-3.6ubuntu3 amd64
+libpam-modules-bin 1.1.8-3.6ubuntu3 amd64
+libpam-runtime 1.1.8-3.6ubuntu3 all
+libpam-systemd 239-7ubuntu10.13 amd64
+libpam0g 1.1.8-3.6ubuntu3 amd64
-libpcre3 2:8.39-11 amd64
+libpcre3 2:8.39-12~18.10 amd64
-libplymouth4 0.9.3-1ubuntu10 amd64
-libpng16-16 1.6.34-2 amd64
-libpolkit-gobject-1-0 0.105-21ubuntu0.3 amd64
+libplymouth4 0.9.3-1ubuntu10.1 amd64
+libpng16-16 1.6.34-2ubuntu0.1 amd64
+libpolkit-gobject-1-0 0.105-21ubuntu0.4 amd64
-libpython2.7 2.7.15-4ubuntu4 amd64
-libpython2.7-minimal 2.7.15-4ubuntu4 amd64
-libpython2.7-stdlib 2.7.15-4ubuntu4 amd64
+libpython2.7 2.7.16-2~18.10 amd64
+libpython2.7-minimal 2.7.16-2~18.10 amd64
+libpython2.7-stdlib 2.7.16-2~18.10 amd64
-libpython3.6 3.6.7-1~18.10 amd64
-libpython3.6-minimal 3.6.7-1~18.10 amd64
-libpython3.6-stdlib 3.6.7-1~18.10 amd64
+libpython3.6 3.6.8-1~18.10 amd64
+libpython3.6-minimal 3.6.8-1~18.10 amd64
+libpython3.6-stdlib 3.6.8-1~18.10 amd64
-libssl1.0.0 1.0.2n-1ubuntu6.1 amd64
+libssl1.0.0 1.0.2n-1ubuntu6.2 amd64
-libstdc++6 8.2.0-7ubuntu1 amd64
+libstdc++6 8.3.0-6ubuntu1~18.10 amd64
-libsystemd0 239-7ubuntu10.8 amd64
+libsystemd0 239-7ubuntu10.13 amd64
-libtiff5 4.0.9-6ubuntu0.1 amd64
+libtiff5 4.0.9-6ubuntu0.2 amd64
-libudev1 239-7ubuntu10.8 amd64
-libunistring2 0.9.10-1ubuntu1 amd64
+libudev1 239-7ubuntu10.13 amd64
+libunistring2 0.9.10-1ubuntu1.18.10.1 amd64
-libxslt1.1 1.1.32-2 amd64
+libxslt1.1 1.1.32-2ubuntu0.1 amd64
-linux-firmware 1.175.1 all
+linux-firmware 1.175.4 all
-mysql-client-5.7 5.7.25-0ubuntu0.18.10.2 amd64
-mysql-client-core-5.7 5.7.25-0ubuntu0.18.10.2 amd64
+mysql-client-5.7 5.7.26-0ubuntu0.18.10.1 amd64
+mysql-client-core-5.7 5.7.26-0ubuntu0.18.10.1 amd64
-mysql-server 5.7.25-0ubuntu0.18.10.2 all
-mysql-server-5.7 5.7.25-0ubuntu0.18.10.2 amd64
-mysql-server-core-5.7 5.7.25-0ubuntu0.18.10.2 amd64
+mysql-server 5.7.26-0ubuntu0.18.10.1 all
+mysql-server-5.7 5.7.26-0ubuntu0.18.10.1 amd64
+mysql-server-core-5.7 5.7.26-0ubuntu0.18.10.1 amd64
-netplan.io 0.40.2.2 amd64
+netplan.io 0.97-0ubuntu1~18.10.1 amd64
-ntfs-3g 1:2017.3.23-2 amd64
-openssh-client 1:7.7p1-4ubuntu0.2 amd64
-openssh-server 1:7.7p1-4ubuntu0.2 amd64
-openssh-sftp-server 1:7.7p1-4ubuntu0.2 amd64
+ntfs-3g 1:2017.3.23-2ubuntu0.18.10.2 amd64
+openssh-client 1:7.7p1-4ubuntu0.3 amd64
+openssh-server 1:7.7p1-4ubuntu0.3 amd64
+openssh-sftp-server 1:7.7p1-4ubuntu0.3 amd64
-php7.2 7.2.15-0ubuntu0.18.10.1 all
-php7.2-bz2 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-cli 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-common 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-curl 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-gd 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-json 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-mbstring 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-mysql 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-opcache 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-readline 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-xml 7.2.15-0ubuntu0.18.10.1 amd64
-php7.2-zip 7.2.15-0ubuntu0.18.10.1 amd64
+php7.2 7.2.17-0ubuntu0.18.10.1 all
+php7.2-bz2 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-cli 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-common 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-curl 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-gd 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-json 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-mbstring 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-mysql 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-opcache 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-readline 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-xml 7.2.17-0ubuntu0.18.10.1 amd64
+php7.2-zip 7.2.17-0ubuntu0.18.10.1 amd64
-plymouth 0.9.3-1ubuntu10 amd64
-plymouth-theme-ubuntu-text 0.9.3-1ubuntu10 amd64
+plymouth 0.9.3-1ubuntu10.1 amd64
+plymouth-theme-ubuntu-text 0.9.3-1ubuntu10.1 amd64
-python-apt-common 1.7.0 all
+python-apt-common 1.7.1 all
-python2.7 2.7.15-4ubuntu4 amd64
-python2.7-minimal 2.7.15-4ubuntu4 amd64
+python2.7 2.7.16-2~18.10 amd64
+python2.7-minimal 2.7.16-2~18.10 amd64
-python3-apt 1.7.0 amd64
+python3-apt 1.7.1 amd64
-python3-distro-info 0.18 all
-python3-distupgrade 1:18.10.11.5 all
-python3-gdbm 3.6.7-1~18.10 amd64
+python3-distro-info 0.18ubuntu0.18.10.2 all
+python3-distupgrade 1:18.10.11.7 all
+python3-gdbm 3.6.8-1~18.10 amd64
-python3-update-manager 1:18.10.10.1 all
+python3-update-manager 1:18.10.10.2 all
-python3.6 3.6.7-1~18.10 amd64
-python3.6-minimal 3.6.7-1~18.10 amd64
+python3.6 3.6.8-1~18.10 amd64
+python3.6-minimal 3.6.8-1~18.10 amd64
-systemd 239-7ubuntu10.8 amd64
-systemd-sysv 239-7ubuntu10.8 amd64
+systemd 239-7ubuntu10.13 amd64
+systemd-sysv 239-7ubuntu10.13 amd64
-tzdata 2018i-0ubuntu0.18.10 all
+tzdata 2019a-0ubuntu0.18.10 all
-ubuntu-minimal 1.425 amd64
-ubuntu-release-upgrader-core 1:18.10.11.5 all
-ubuntu-standard 1.425 amd64
+ubuntu-minimal 1.425.1 amd64
+ubuntu-release-upgrader-core 1:18.10.11.7 all
+ubuntu-standard 1.425.1 amd64
-udev 239-7ubuntu10.8 amd64
-ufw 0.35-6 all
-update-manager-core 1:18.10.10.1 all
+udev 239-7ubuntu10.13 amd64
+ufw 0.36-0ubuntu0.18.10.1 all
+update-manager-core 1:18.10.10.2 all
-webmin 1.900 all
-wget 1.19.5-1ubuntu1 amd64
+webmin 1.910 all
+wget 1.19.5-1ubuntu1.1 amd64
-xkb-data 2.23.1-1ubuntu1 all
+xkb-data 2.23.1-1ubuntu1.18.10.1 all

103 files changed:
.etckeeper
console-setup/cached_setup_font.sh
console-setup/cached_setup_keyboard.sh
default/ufw
php/7.2/apache2/php.ini
php/7.2/cli/php.ini
ufw/before.rules
ufw/before6.rules
webmin/adsl-client/config
webmin/apache/config
webmin/apache/httpd-info [new file with mode: 0644]
webmin/backup-config/config
webmin/bacula-backup/config
webmin/bandwidth/config
webmin/bind8/config
webmin/burner/config
webmin/cluster-passwd/config
webmin/cluster-software/config
webmin/cluster-useradmin/config
webmin/cluster-usermin/config
webmin/config
webmin/cpan/config
webmin/cron/config
webmin/custom/config
webmin/dhcpd/config
webmin/dovecot/config
webmin/exim/config
webmin/exports/config
webmin/fail2ban/config
webmin/fetchmail/config
webmin/filter/config
webmin/firewall/config
webmin/firewall6/config
webmin/fsdump/config
webmin/grub/config
webmin/heartbeat/config
webmin/htaccess-htpasswd/config
webmin/inetd/config
webmin/init/config
webmin/ipfilter/config
webmin/ipfw/config
webmin/ipsec/config
webmin/iscsi-client/config
webmin/iscsi-server/config
webmin/iscsi-target/config
webmin/iscsi-tgtd/config
webmin/jabber/config
webmin/ldap-client/config
webmin/ldap-server/config
webmin/ldap-useradmin/config
webmin/logrotate/config
webmin/lpadmin/config
webmin/mailboxes/config
webmin/man/config
webmin/miniserv.conf
webmin/mon/config
webmin/mount/config
webmin/mysql/config
webmin/mysql/version [new file with mode: 0644]
webmin/nis/config
webmin/openslp/config
webmin/package-updates/config
webmin/pam/config
webmin/pap/config
webmin/postfix/config
webmin/postgresql/config
webmin/ppp-client/config
webmin/pptp-client/config
webmin/pptp-server/config
webmin/proc/config
webmin/procmail/config
webmin/proftpd/config
webmin/qmailadmin/config
webmin/quota/config
webmin/raid/config
webmin/samba/config
webmin/sarg/config
webmin/sendmail/config
webmin/servers/config
webmin/shell/config
webmin/shorewall/config
webmin/shorewall6/config
webmin/smart-status/config
webmin/software/config
webmin/spam/config
webmin/squid/config
webmin/sshd/config
webmin/status/config
webmin/syslog-ng/config
webmin/syslog/config
webmin/system-status/config
webmin/tcpwrappers/config
webmin/telnet/config
webmin/time/config
webmin/updown/config
webmin/useradmin/config
webmin/usermin/config
webmin/version
webmin/vgetty/config
webmin/webalizer/config
webmin/webmin/config
webmin/wuftpd/config
webmin/xinetd/config

index 40c9c9cde6ea5ba30e1978f94f50dd8765b5cdb3..568fb64aa4eec03f34fd9d78691b7b1e4b2f9d4d 100755 (executable)
@@ -3,6 +3,7 @@
 mkdir -p './X11/xkb'
 mkdir -p './acpi/events'
 mkdir -p './apparmor.d/force-complain'
+mkdir -p './apt/auth.conf.d'
 mkdir -p './apt/preferences.d'
 mkdir -p './binfmt.d'
 mkdir -p './ca-certificates/update.d'
@@ -367,6 +368,7 @@ maybe chmod 0644 'apt/apt.conf.d/05etckeeper'
 maybe chmod 0644 'apt/apt.conf.d/20apt-show-versions'
 maybe chmod 0644 'apt/apt.conf.d/50command-not-found'
 maybe chmod 0644 'apt/apt.conf.d/70debconf'
+maybe chmod 0755 'apt/auth.conf.d'
 maybe chmod 0755 'apt/preferences.d'
 maybe chmod 0644 'apt/sources.list'
 maybe chmod 0755 'apt/sources.list.d'
@@ -1167,6 +1169,7 @@ maybe chgrp 'bin' 'webmin/apache'
 maybe chmod 0711 'webmin/apache'
 maybe chgrp 'bin' 'webmin/apache/config'
 maybe chmod 0600 'webmin/apache/config'
+maybe chmod 0644 'webmin/apache/httpd-info'
 maybe chgrp 'bin' 'webmin/at'
 maybe chmod 0711 'webmin/at'
 maybe chgrp 'bin' 'webmin/at/config'
@@ -1423,6 +1426,7 @@ maybe chgrp 'bin' 'webmin/mysql'
 maybe chmod 0711 'webmin/mysql'
 maybe chgrp 'bin' 'webmin/mysql/config'
 maybe chmod 0600 'webmin/mysql/config'
+maybe chmod 0644 'webmin/mysql/version'
 maybe chgrp 'bin' 'webmin/net'
 maybe chmod 0711 'webmin/net'
 maybe chgrp 'bin' 'webmin/net/config'
index b11959cc1a01049550455c24fa917cce2492200f..6c3f480612c1d5b410d4ad6ef6813e539be2da4c 100755 (executable)
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-setfont '/etc/console-setup/Uni2-Fixed16.psf.gz' 
+setfont '/etc/console-setup/cached_Uni2-Fixed16.psf.gz' 
 
 if ls /dev/fb* >/dev/null 2>/dev/null; then
     for i in /dev/vcs[0-9]*; do
         { :
-            setfont '/etc/console-setup/Uni2-Fixed16.psf.gz' 
+            setfont '/etc/console-setup/cached_Uni2-Fixed16.psf.gz' 
         } < /dev/tty${i#/dev/vcs} > /dev/tty${i#/dev/vcs}
     done
 fi
index f62b04e60efdc5d49b4fa909cdcc3a31f98bf2e9..7349f682a157a9a1a554ea5bf2addef064798914 100755 (executable)
@@ -4,5 +4,10 @@ if [ -f /run/console-setup/keymap_loaded ]; then
     rm /run/console-setup/keymap_loaded
     exit 0
 fi
-kbd_mode '-u' 
-loadkeys '/tmp/tmpkbd.5vJREz' > '/dev/null' 
+kbd_mode '-u' < '/dev/tty1' 
+kbd_mode '-u' < '/dev/tty2' 
+kbd_mode '-u' < '/dev/tty3' 
+kbd_mode '-u' < '/dev/tty4' 
+kbd_mode '-u' < '/dev/tty5' 
+kbd_mode '-u' < '/dev/tty6' 
+loadkeys '/run/tmpkbd.nMVv8x' > '/dev/null' 
index 665806f3e35e6e91554a11671264eeb5ab5d7d83..83c9ac3e6f1627e3c99e79f4ffb739cee8a9f970 100644 (file)
@@ -41,5 +41,6 @@ IPT_SYSCTL=/etc/ufw/sysctl.conf
 # nf_conntrack_pptp, nf_nat_pptp: PPTP over stateful firewall/NAT
 # nf_conntrack_ftp, nf_nat_ftp: active FTP support
 # nf_conntrack_tftp, nf_nat_tftp: TFTP support (server side)
+# nf_conntrack_sane: sane support
 IPT_MODULES="nf_conntrack_ftp nf_nat_ftp nf_conntrack_netbios_ns"
 
index 75f9107aaf423e298c49f65e55f3972d08b297c2..87f38e1ae6f5333e9f7522bfebc714d13ef4545c 100644 (file)
@@ -993,8 +993,19 @@ cli_server.color = On
 ;intl.use_exceptions = 0
 
 [sqlite3]
+; Directory pointing to SQLite3 extensions
+; http://php.net/sqlite3.extension-dir
 ;sqlite3.extension_dir =
 
+; SQLite defensive mode flag (only available from SQLite 3.26+)
+; When the defensive flag is enabled, language features that allow ordinary
+; SQL to deliberately corrupt the database file are disabled. This forbids
+; writing directly to the schema, shadow tables (eg. FTS data tables), or
+; the sqlite_dbpage virtual table.
+; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html
+; (for older SQLite versions, this flag has no use)
+sqlite3.defensive = 1
+
 [Pcre]
 ;PCRE library backtracking limit.
 ; http://php.net/pcre.backtrack-limit
index bdb75eb6a1115778d8dae07fd0a6cc7ff21d0948..737b619e2d67fa55c2e02f3da6474247325f5b2f 100644 (file)
@@ -993,8 +993,19 @@ cli_server.color = On
 ;intl.use_exceptions = 0
 
 [sqlite3]
+; Directory pointing to SQLite3 extensions
+; http://php.net/sqlite3.extension-dir
 ;sqlite3.extension_dir =
 
+; SQLite defensive mode flag (only available from SQLite 3.26+)
+; When the defensive flag is enabled, language features that allow ordinary
+; SQL to deliberately corrupt the database file are disabled. This forbids
+; writing directly to the schema, shadow tables (eg. FTS data tables), or
+; the sqlite_dbpage virtual table.
+; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html
+; (for older SQLite versions, this flag has no use)
+sqlite3.defensive = 1
+
 [Pcre]
 ;PCRE library backtracking limit.
 ; http://php.net/pcre.backtrack-limit
index 0addd54c6368b6e3f8a085793a7d60c7d37923d5..23b384eb0676383c95f44d8ffc64daa679767959 100644 (file)
 
 # ok icmp codes for INPUT
 -A ufw-before-input -p icmp --icmp-type destination-unreachable -j ACCEPT
--A ufw-before-input -p icmp --icmp-type source-quench -j ACCEPT
 -A ufw-before-input -p icmp --icmp-type time-exceeded -j ACCEPT
 -A ufw-before-input -p icmp --icmp-type parameter-problem -j ACCEPT
 -A ufw-before-input -p icmp --icmp-type echo-request -j ACCEPT
 
 # ok icmp code for FORWARD
 -A ufw-before-forward -p icmp --icmp-type destination-unreachable -j ACCEPT
--A ufw-before-forward -p icmp --icmp-type source-quench -j ACCEPT
 -A ufw-before-forward -p icmp --icmp-type time-exceeded -j ACCEPT
 -A ufw-before-forward -p icmp --icmp-type parameter-problem -j ACCEPT
 -A ufw-before-forward -p icmp --icmp-type echo-request -j ACCEPT
index 30e90c7dbd9d49a24ef24609cc6291dfbd044c1e..abebbe74dced61d3bfcf38c7815011b7d483c5f5 100644 (file)
 -A ufw6-before-output -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
 -A ufw6-before-forward -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
 
+# multicast ping replies are part of the ok icmp codes for INPUT (rfc4890,
+# 4.4.1 and 4.4.2), but don't have an associated connection and are otherwise
+# be marked INVALID, so allow here instead.
+-A ufw6-before-input -p icmpv6 --icmpv6-type echo-reply -j ACCEPT
+
 # drop INVALID packets (logs these in loglevel medium and higher)
 -A ufw6-before-input -m conntrack --ctstate INVALID -j ufw6-logging-deny
 -A ufw6-before-input -m conntrack --ctstate INVALID -j DROP
 -A ufw6-before-input -p icmpv6 --icmpv6-type packet-too-big -j ACCEPT
 # codes 0 and 1
 -A ufw6-before-input -p icmpv6 --icmpv6-type time-exceeded -j ACCEPT
-# codes 0-2
+# codes 0-2 (echo-reply needs to be before INVALID, see above)
 -A ufw6-before-input -p icmpv6 --icmpv6-type parameter-problem -j ACCEPT
 -A ufw6-before-input -p icmpv6 --icmpv6-type echo-request -j ACCEPT
--A ufw6-before-input -p icmpv6 --icmpv6-type echo-reply -j ACCEPT
 -A ufw6-before-input -p icmpv6 --icmpv6-type router-solicitation -m hl --hl-eq 255 -j ACCEPT
 -A ufw6-before-input -p icmpv6 --icmpv6-type router-advertisement -m hl --hl-eq 255 -j ACCEPT
 -A ufw6-before-input -p icmpv6 --icmpv6-type neighbor-solicitation -m hl --hl-eq 255 -j ACCEPT
index 4c1693f666d3c2c6ec0a992559617016749a4fed..da7c5b564cc64a6f6637a3acc0cd9d2006056005 100644 (file)
@@ -1,7 +1,7 @@
-pap_file=/etc/ppp/pap-secrets
-stop_cmd=adsl-stop
-start_cmd=adsl-start
 conf_style=0
+start_cmd=adsl-start
 status_cmd=adsl-status
-pppoe_conf=/etc/ppp/pppoe.conf
+stop_cmd=adsl-stop
 pppoe_cmd=pppoe
+pppoe_conf=/etc/ppp/pppoe.conf
+pap_file=/etc/ppp/pap-secrets
index c85b8a27b3a7d9294562a3f31c306df165c1188e..7b2bf462ee0abb66a25ae8094536609382c56ebb 100644 (file)
@@ -1,24 +1,24 @@
-httpd_conf=/etc/apache2/apache2.conf
-start_cmd=/etc/init.d/apache2 start
-test_manual=0
-link_dir=/etc/apache2/sites-enabled
-srm_conf=/etc/apache2/srm.conf
+show_order=0
+httpd_path=/usr/sbin/apache2
+auto_mods=1
+show_names=0
+test_apachectl=1
+access_conf=/etc/apache2/access.conf
+test_always=0
+max_servers=100
 defines_file=/etc/apache2/envvars
+start_cmd=/etc/init.d/apache2 start
 show_list=0
-auto_mods=1
-apply_cmd=/usr/sbin/apache2ctl graceful
-virt_file=/etc/apache2/sites-available
-httpd_path=/usr/sbin/apache2
+srm_conf=/etc/apache2/srm.conf
 apachectl_path=/usr/sbin/apache2ctl
-max_servers=100
-test_config=1
-test_apachectl=1
-httpd_dir=/etc/apache2
-stop_cmd=/etc/init.d/apache2 stop
-allow_virtualmin=0
-show_order=0
-show_names=0
 mime_types=/etc/apache2/mime.types
-test_always=0
+allow_virtualmin=0
+link_dir=/etc/apache2/sites-enabled
+stop_cmd=/etc/init.d/apache2 stop
+test_manual=0
+httpd_dir=/etc/apache2
 defines_name=APACHE_ARGUMENTS
-access_conf=/etc/apache2/access.conf
+httpd_conf=/etc/apache2/apache2.conf
+virt_file=/etc/apache2/sites-available
+apply_cmd=/usr/sbin/apache2ctl graceful
+test_config=1
diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info
new file mode 100644 (file)
index 0000000..54dad20
--- /dev/null
@@ -0,0 +1,4 @@
+mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
+cmd=/usr/sbin/apache2
+version=2.434
+time=1554295809
index c13b50ad6a3f6b5862a7665f45808cc3dc3e19c4..3bdfb12314d2029a5f48b8a829223d76f2c7e3b2 100644 (file)
@@ -1,3 +1,3 @@
-webmin_subs=0
-apply=1
 date_subs=0
+apply=1
+webmin_subs=0
index 1afe16180878cae279afe6b8e3edb730f8a34c10..f1d15ff87eb4aecd136b11f6babcb492021ea917 100644 (file)
@@ -1,12 +1,12 @@
-wait=1
-showdirs=0
-db=bacula
-bls=bls
+apply=1
+bextract=bextract
 btape=btape
-pass=
+db=bacula
 driver=Pg
+user=bacula
+pass=
+showdirs=0
 bacula_dir=/etc/bacula
-bextract=bextract
+wait=1
 init_start=0
-user=bacula
-apply=1
+bls=bls
index ee8595f7a48e0dce9d9469f9e7d1956ea2bc5b2b..bcce7e8d6dca9689cacedbfcf6fa0efa3f9c8282 100644 (file)
@@ -1,2 +1,2 @@
-bandwidth_log=/var/log/bandwidth
 firewall_system=
+bandwidth_log=/var/log/bandwidth
index d505de665ef08cbcba5d22844804ad605be9ef97..fd7cb1ea4783643a2c912964040d41e443da431f 100644 (file)
@@ -1,45 +1,45 @@
-confirm_zone=1
-no_pid_chroot=0
-reversezonefilename_format=ZONE.rev
-checkzone=named-checkzone
-records_order=0
-rev_def=0
-rndc_cmd=rndc
-support_aaaa=1
+no_chroot=0
+short_names=0
+relative_paths=0
 confirm_rec=0
-allow_underscore=1
-checkconf=named-checkconf
-rev_must=0
-keygen=dnssec-keygen
-slave_dir=/var/lib/bind
-pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
-soa_start=0
-ipv6_mode=1
-rndc_conf=/etc/bind/rndc.conf
 master_ttl=1
-largezones=0
-signzone=dnssec-signzone
-whois_cmd=whois
+rndc_conf=/etc/bind/rndc.conf
 spf_record=0
-max_zones=50
-other_slaves=1
+no_pid_chroot=0
+master_dir=/var/lib/bind
+allow_underscore=1
 ndc_cmd=ndc
-forwardzonefilename_format=ZONE.hosts
-soa_style=0
+max_zones=50
+records_order=0
+updserial_man=1
+rndcconf_cmd=rndc-confgen
+named_path=/usr/sbin/named
+rev_def=0
+allow_comments=0
+rev_must=0
 named_conf=/etc/bind/named.conf
-force_random=0
 show_list=0
 allow_wild=1
-named_path=/usr/sbin/named
-by_view=0
-updserial_man=1
-no_chroot=0
-allow_long=0
+checkconf=named-checkconf
 updserial_def=0
-updserial_on=1
-master_dir=/var/lib/bind
-allow_comments=0
-rndcconf_cmd=rndc-confgen
-short_names=0
-relative_paths=0
+other_slaves=1
+confirm_zone=1
+reversezonefilename_format=ZONE.rev
+force_random=0
+ipv6_mode=1
+signzone=dnssec-signzone
+slave_dir=/var/lib/bind
+soa_style=0
+rndc_cmd=rndc
+soa_start=0
+forwardzonefilename_format=ZONE.hosts
+support_aaaa=1
+by_view=0
 zones_file=/etc/bind/named.conf.local
+pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
+updserial_on=1
+whois_cmd=whois
+checkzone=named-checkzone
+largezones=0
+allow_long=0
+keygen=dnssec-keygen
index 39ce4fe9ef285471c1f5910391dd747cb73689c1..9240f4735b165a6e4b45dcd3b3916f6a0a83220d 100644 (file)
@@ -1,6 +1,6 @@
-mpg123=mpg123
-cdrdao=cdrdao
-speed=1
-cdrecord=cdrecord
 sox=sox
+speed=1
 mkisofs=mkisofs
+cdrdao=cdrdao
+mpg123=mpg123
+cdrecord=cdrecord
index 04110de954ef8ed5a644b4a718c43ee8f546e2c0..1c1ed801df780c749f8753e235a79011201bd452 100644 (file)
@@ -1,3 +1,3 @@
+sort_mode=0
 max_users=200
 input_type=0
-sort_mode=0
index fd788cb1e074549f6b0858f1e816c867c16118a7..470eaee86535d874ac8fe55dbfee746a3dd61ef8 100644 (file)
@@ -1,2 +1,2 @@
-table_mode=0
 sort_mode=0
+table_mode=0
index 152f1134e25577e827f3484323cf94437eb9521f..ec448d9863bf0998dd1b2929b42bfca6c1c0b76a 100644 (file)
@@ -1,9 +1,9 @@
-conf_add_user=1
-conf_find_user=1
+sort_mode=0
+conf_host_links=1
 conf_allow_refresh=1
 table_mode=0
-conf_find_group=1
-sort_mode=0
+conf_add_user=1
 conf_add_group=1
-conf_host_links=1
+conf_find_user=1
 conf_allow_sync=1
+conf_find_group=1
index 470eaee86535d874ac8fe55dbfee746a3dd61ef8..fd788cb1e074549f6b0858f1e816c867c16118a7 100644 (file)
@@ -1,2 +1,2 @@
-sort_mode=0
 table_mode=0
+sort_mode=0
index 2e7caf04be4a1366bba82e3501fc1a3633e544f0..df672a2e1093fb23909cfc63f73348ebfb260b16 100644 (file)
@@ -1,20 +1,20 @@
 passwd_cindex=2
-passwd_pindex=1
-ld_env=LD_LIBRARY_PATH
-passwd_file=/etc/shadow
+real_os_type=Ubuntu Linux
+product=webmin
+real_os_version=18.10
+theme=authentic-theme
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+lang=en.UTF-8
 by_view=0
+log=1
 find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
 tempdelete_days=7
 passwd_uindex=0
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-passwd_mindex=4
-os_type=debian-linux
 os_version=9.0
-real_os_type=Ubuntu Linux
-real_os_version=18.10
-lang=en.UTF-8
-log=1
-referers_none=1
+passwd_pindex=1
+passwd_mindex=4
 md5pass=1
-theme=authentic-theme
-product=webmin
+ld_env=LD_LIBRARY_PATH
+passwd_file=/etc/shadow
+referers_none=1
+os_type=debian-linux
index 9739448549b40ac4d1339c503b8adb754241f13d..d7e737bd3c20238eec1b5b232d59d4c0d4f2eeae 100644 (file)
@@ -1,6 +1,6 @@
-incyum=1
-packages=http://www.cpan.org/modules/02packages.details.txt.gz
+cpan=http://www.cpan.org/authors/id
 save_partial=0
-refresh_days=30
 incpackages=1
-cpan=http://www.cpan.org/authors/id
+refresh_days=30
+incyum=1
+packages=http://www.cpan.org/modules/02packages.details.txt.gz
index 9f57b338f10ffb68b061709d046218a4fa89aa3f..da4cc11e63112a1f6518d5429a9ca2d4bc86e97d 100644 (file)
@@ -1,24 +1,25 @@
-show_run=0
-system_crontab=/etc/crontab
-max_len=80
-cron_deny_file=/var/spool/cron/deny
-cron_input=1
+show_comment=0
 cron_edit_command=crontab -u USER -e
-cron_allow_file=/var/spool/cron/allow
-cron_dir=/var/spool/cron/crontabs
-show_time=0
-cron_user_delete_command=crontab -r
+cron_user_edit_command=crontab -e
 cron_delete_command=crontab -u USER -r
+run_parts=run-parts
+kill_subs=0
+hourly_only=0
+max_jobs=100
+cron_input=1
+cron_dir=/var/spool/cron/crontabs
+match_mode=0
+system_crontab=/etc/crontab
 cron_deny_all=2
 match_user=1
+cron_allow_file=/var/spool/cron/allow
+max_len=80
+cron_deny_file=/var/spool/cron/deny
+show_run=0
 cron_get_command=crontab -u USER -l
-max_jobs=100
 cron_user_get_command=crontab -l
 cronfiles_dir=/etc/cron.d
-hourly_only=0
-match_mode=0
-run_parts=run-parts
+show_next=0
+show_time=0
 vixie_cron=1
-show_comment=0
-cron_user_edit_command=crontab -e
-kill_subs=0
+cron_user_delete_command=crontab -r
index 37a670e143546cb0136222b4638d59feb353f1ab..9d7bae50ac5f3f1760f357f549657a753e1077cf 100644 (file)
@@ -1,4 +1,4 @@
-params_file=0
-columns=2
 display_mode=0
 params_cmd=0
+params_file=0
+columns=2
index 1a8614cc58d9716904509747da1850e43d911b5d..0193ac3d11d77269c7c38b05da1b52d1d4801793 100644 (file)
@@ -1,16 +1,16 @@
-show_mac=0
+display_max=100
+dhcpd_path=/usr/sbin/dhcpd
 lease_sort=0
-interfaces_type=debian
-dhcpd_nocols=5
+show_mac=0
 start_cmd=service isc-dhcp-server start
+lease_tz=0
+interfaces_type=debian
 lease_file=/var/lib/dhcp/dhcpd.leases
+dhcpd_nocols=5
+show_ip=0
 pid_file=/var/run/dhcpd.pid
-display_max=100
-dhcpd_conf=/etc/dhcp/dhcpd.conf
+restart_cmd=service isc-dhcp-server restart
 stop_cmd=service isc-dhcp-server stop
-show_ip=0
-dhcpd_path=/usr/sbin/dhcpd
+dhcpd_conf=/etc/dhcp/dhcpd.conf
 group_name=0
 desc_name=0
-lease_tz=0
-restart_cmd=service isc-dhcp-server restart
index e7222cc86ff991f764b10bfd00b7796089aa76d9..bb2bfb2d5ba9f2a627cf92fdc48bd30e1acecaff 100644 (file)
@@ -1,4 +1,4 @@
-dovecot=/usr/sbin/dovecot
 pid_file=/var/run/dovecot/master.pid
 init_script=dovecot
+dovecot=/usr/sbin/dovecot
 dovecot_config=/etc/dovecot/dovecot.conf
index 376034e21b28e9b060a6fa9743f893b22bb4f1c7..58107cce783bde51340a835340c598309e7f7abe 100644 (file)
@@ -1,8 +1,8 @@
-exim_virt_dir=/etc/exim4/aliases
-exim_aliasfileext=
 exim_dbmfile=/etc/exim4/local_domains
+exim_mail_file=Maildir
+exim_aliasfileext=
+exim_virt_dir=/etc/exim4/aliases
 mail_system=1
 exim_addrfile=/etc/exim4/email-addresses
-exim_mail_file=Maildir
-exim_dbmext=.dbm
 exim_dir=/etc/exim4
+exim_dbmext=.dbm
index 5a48ca66fb55683866e1a0cfe1c82382aa28c518..8f8b567ee5c1eba3721a712ee9c1a4be0b5428be 100644 (file)
@@ -1,3 +1,3 @@
+exports_file=/etc/exports
 apply_cmd=exportfs -r
 restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi
-exports_file=/etc/exports
index c0503a2b68cdbbe6b40331db03e0bd94ce371775..5364b4b6dc9b01d2d67022be47945ee44d23c42d 100644 (file)
@@ -1,4 +1,4 @@
-client_cmd=/usr/bin/fail2ban-client
 init_script=fail2ban
 server_cmd=/usr/bin/fail2ban-server
+client_cmd=/usr/bin/fail2ban-client
 config_dir=/etc/fail2ban
index d656b15b7af48c7978d619012dcde549e4ba4894..868bd73e7662c1fa9cfa1f3f7b94c7c18bd32020 100644 (file)
@@ -1,6 +1,6 @@
 view_mode=0
+pid_file=/var/run/fetchmail.pid
 daemon_user=root
-config_file=
 max_users=400
+config_file=
 fetchmail_path=fetchmail
-pid_file=/var/run/fetchmail.pid
index d67a76f22d1c6d4d00a9b1ea8ea97fbc34aa8af0..05a27aaaf93adc3b2d3bc18e702d5f9fd7ac8cfc 100644 (file)
@@ -1,6 +1,6 @@
-warn_procmail=1
+virtualmin_config=/etc/webmin/virtual-server
 alias_files=/etc/aliases       /etc/postfix/aliases    /etc/mail/aliases
 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
-forward_procmail=0
+warn_procmail=1
 reply_force=0
-virtualmin_config=/etc/webmin/virtual-server
+forward_procmail=0
index da1175532a26b38187990bae9c96f4aa40f35f4b..7edc5e9a7607c96b41f48d1d732c4108aaf7a426 100644 (file)
@@ -1,6 +1,6 @@
 comment_mod=0
 view_condition=1
-force_init=0
-view_comment=0
 cluster_mode=1
 direct=0
+force_init=0
+view_comment=0
index ebdfa5a37fbbeaeb617c00d458755566378c9491..7edc5e9a7607c96b41f48d1d732c4108aaf7a426 100644 (file)
@@ -1,6 +1,6 @@
 comment_mod=0
 view_condition=1
 cluster_mode=1
+direct=0
 force_init=0
 view_comment=0
-direct=0
index 15c42770f5027a11a3e09f377d9dccc1d702b745..a8374632dd495c41ec2b79b3ecfb184d3150aafd 100644 (file)
@@ -1,7 +1,7 @@
-run_mode=0
 webmin_subs=0
-nonewtape=0
 simple_sched=0
-date_subs=0
 error_email=0
+run_mode=0
 always_tar=0
+nonewtape=0
+date_subs=0
index e16a6b3dd52b12814a41d4f0d4c54d67c20f1a50..f6464eb2a6b58252ed6b529e6f893f79d52919bc 100644 (file)
@@ -1,3 +1,3 @@
-menu_file=/boot/grub/menu.lst
 install=(hd0)
 grub_path=grub
+menu_file=/boot/grub/menu.lst
index 4084e2f44899ba53f640a53e2f5f918b3942d28d..bd1f36b93c26e4184859380aa432e8b0e3815fc3 100644 (file)
@@ -1,15 +1,15 @@
-heartbeat=/usr/lib/heartbeat/heartbeat
-pid_file=/var/run/heartbeat.pid
-req_resource_cmd=/usr/lib/heartbeat/req_resource
-authkeys=
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
-alt_haresources=/usr/share/doc/packages/heartbeat/haresources
-apply_cmd=/etc/init.d/heartbeat reload
-haresources=
-alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
 ha_dir=/etc/ha.d
-ha_cf=
 resource_d=
+apply_cmd=/etc/init.d/heartbeat reload
+ha_cf=
 serials=/dev/ttyS*
-stop_cmd=/etc/init.d/heartbeat stop
+heartbeat=/usr/lib/heartbeat/heartbeat
 start_cmd=/etc/init.d/heartbeat start
+alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+haresources=
+stop_cmd=/etc/init.d/heartbeat stop
+req_resource_cmd=/usr/lib/heartbeat/req_resource
+alt_haresources=/usr/share/doc/packages/heartbeat/haresources
+authkeys=
+pid_file=/var/run/heartbeat.pid
index 302cfa39d6b432f85d2866f1453d7939ee5e6eb5..8689560ac920edf72a8f2a6f063bfff534c7f6a2 100644 (file)
@@ -1,8 +1,8 @@
-md5=1
-extra_directives=
-htgroups=.htgroups
-sha1=0
-htaccess=.htaccess
 htpasswd=.htpasswd
 digest=1
+htaccess=.htaccess
+htgroups=.htgroups
+md5=1
 sort=0
+sha1=0
+extra_directives=
index 28ab70798a4ff6d426be02fc2802706d29122db7..bd09fe5dbe94e68e6618cbb1121cbf0e93fecfe0 100644 (file)
@@ -1,16 +1,16 @@
-display_max=100
-inetd_conf_file=/etc/inetd.conf
+tcpd_path=/usr/sbin/tcpd
+restart_command=killall -HUP inetd
 deny_file=/etc/hosts.deny
-services_file=/etc/services
+inetd_conf_file=/etc/inetd.conf
 protocols_file=/etc/protocols
 allow_file=/etc/hosts.allow
-restart_command=killall -HUP inetd
-sort_mode=0
-extended_inetd=1
-rpc_file=/etc/rpc
-rpc_inetd=1
-tcpd_path=/usr/sbin/tcpd
-show_empty=1
 ipv6=0
+sort_mode=0
+display_max=100
 rpc_protocols=tcp udp
 qm_mode=0
+rpc_inetd=1
+show_empty=1
+services_file=/etc/services
+extended_inetd=1
+rpc_file=/etc/rpc
index d6d814624482dfe6def8a4d54730633d080d08f3..2c75590035a4faeb25a38ab99ea57afddba7da6a 100644 (file)
@@ -1,17 +1,17 @@
+show_opts=0
+no_chkconfig=0
+init_info=1
 inittab_id=id
+expert=0
+atboot_product=webmin
 soft_links=1
-init_base=/etc/
+status_check=0
 order=0
 boot_levels=2 3 5
-init_info=1
-expert=0
+init_base=/etc/
+reboot_command=reboot
 sort_mode=0
-show_opts=0
-no_chkconfig=0
-status_check=0
+desc=1
 init_dir=/etc/init.d
-reboot_command=reboot
 shutdown_command=poweroff
 order_digits=2
-desc=1
-atboot_product=webmin
index f918684e22ba4c71601a0424fae464acdb7206b7..92edcee3672f221a82f06a6eddaedca4769fc16b 100644 (file)
@@ -1,9 +1,9 @@
-view_comment=0
-ipf=ipf
-ipnat_conf=/etc/ipf/ipnat.conf
-ipf_conf=/etc/ipf/ipf.conf
-cluster_mode=0
 ipfstat=ipfstat
 view_condition=1
 ipnat=ipnat
+cluster_mode=0
+ipf_conf=/etc/ipf/ipf.conf
+ipnat_conf=/etc/ipf/ipnat.conf
+view_comment=0
+ipf=ipf
 cluster_nat=1
index 7cbda1a387104a660087917db62d97afa5bde1d7..38720180601adaa821efd5608d38c0ee3f403ec9 100644 (file)
@@ -1,6 +1,6 @@
-view_counters=0
 ipfw=/sbin/ipfw
 version=2
+view_condition=1
 cluster_mode=0
 view_comment=0
-view_condition=1
+view_counters=0
index e4f6385810a1d94dcc85c516885eb9a3ddc305a9..206e76adf618055c29a3c2c27d2452cffa2b2e80 100644 (file)
@@ -1,8 +1,8 @@
-ipsec=/usr/sbin/ipsec
 restart_cmd=/etc/init.d/ipsec restart
 file=/etc/ipsec.conf
-secrets=/etc/ipsec.secrets
-start_cmd=/etc/init.d/ipsec start
 stop_cmd=/etc/init.d/ipsec stop
 policies_dir=/etc/ipsec.d/policies
 logfile=/var/log/messages
+ipsec=/usr/sbin/ipsec
+start_cmd=/etc/init.d/ipsec start
+secrets=/etc/ipsec.secrets
index b836ccf6dab26097f64f6ccc04b395f5961f9862..ad479bec6e0a57c02956502c2374f33b312f19bf 100644 (file)
@@ -1,6 +1,6 @@
-config_file=/etc/iscsi/iscsid.conf
-iscsiadm=iscsiadm
 ifaces_dir=/var/lib/iscsi/ifaces
+initiator_file=/etc/iscsi/initiatorname.iscsi
+iscsiadm=iscsiadm
 iscsiiname=iscsi-iname
+config_file=/etc/iscsi/iscsid.conf
 init_name=open-iscsi
-initiator_file=/etc/iscsi/initiatorname.iscsi
index 97b3a92a7babca9b7a1b3366dd4ea4d1af50b040..de7785e59c47ab0c00b85b7eb88a9af5de73b399 100644 (file)
@@ -1,6 +1,6 @@
 opts_file=/etc/sysconfig/netbsd-iscsi
+targets_file=/etc/iscsi/targets
 pid_file=/var/run/iscsi-target.pid
-init_name=netbsd-iscsi
 auths_file=/etc/iscsi/auths
-targets_file=/etc/iscsi/targets
 iscsi_server=/usr/sbin/iscsi-target
+init_name=netbsd-iscsi
index fc1cfb77727adfd3c19a5d7bd7e13beeb42d25e1..f4033a050751e21a8bd7ad56aa3c7f8e342e13a9 100644 (file)
@@ -1,7 +1,7 @@
+pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
 initiators_file=/etc/iet/initiators.allow
+targets_file=/etc/iet/targets.allow
+ietadm=ietadm
 opts_file=/etc/default/iscsitarget
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
-init_name=iscsitarget
 config_file=/etc/iet/ietd.conf
-ietadm=ietadm
-targets_file=/etc/iet/targets.allow
+init_name=iscsitarget
index 90828cbbed65fc8e191f7e9561ab9e32bfd6e1d9..977174dfb5aace828efc5117adc02d167fbf6bfc 100644 (file)
@@ -1,5 +1,5 @@
-init_name=tgtd
 tgtadmin=tgt-admin
 tgtadm=tgtadm
-tgtd=tgtd
+init_name=tgtd
 config_file=/etc/tgt/targets.conf
+tgtd=tgtd
index 5dbbe347d25881a0d670df72fb7270de944631d4..01ba618e06283aba0986cfa3297f7d71f874f618 100644 (file)
@@ -1,5 +1,5 @@
-jabber_daemon=/usr/sbin/jabberd
-stop_cmd=/etc/init.d/jabberd stop
 start_cmd=/etc/init.d/jabberd start
 jabber_dir=/var/lib/jabber
 jabber_config=/etc/jabber/jabber.xml
+stop_cmd=/etc/init.d/jabberd stop
+jabber_daemon=/usr/sbin/jabberd
index 41ce77d5e72d965ef7e4286010241d2d75b4c117..4587ce571ddd2b74f0fa614d0e83175d76b6d069 100644 (file)
@@ -1,3 +1,3 @@
+auth_ldap=/etc/ldap.conf
 init_name=nslcd
 secret=/etc/ldap.secret
-auth_ldap=/etc/ldap.conf
index c960f089e24c33d9bf2515eda76b63cfef1d773d..3c71b164a1481943baa4ee398073367a10d1eb7d 100644 (file)
@@ -1,10 +1,10 @@
-stop_cmd=/etc/init.d/slapd stop
-start_cmd=/etc/init.d/slapd start
-browse_max=100
 schema_dir=/etc/ldap/schema
-slapd=slapd
+config_file=/etc/ldap/slapd.d
+stop_cmd=/etc/init.d/slapd stop
+init_name=slapd
 ldap_user=openldap
 apply_cmd=/etc/init.d/slapd restart
-config_file=/etc/ldap/slapd.d
+slapd=slapd
+start_cmd=/etc/init.d/slapd start
+browse_max=100
 attr_count=6
-init_name=slapd
index 4631ed8d7ea31dd0323656bb5d5c927300fccd23..bbbf5bda24c3a89596d06c96b0dd76c2d6669d6d 100644 (file)
@@ -1,24 +1,24 @@
-imap_folders=old       public  sent-mail
 membox=0
-md5=0
-slappasswd=slappasswd
-imap_class=SuSEeMailObject
-gecos=1
-imap_def=0
 mailfmt=0
 shells=fixed,ldap,passwd,shells
-alias_same=0
-imap_login=cyrus
-imap_foldersep=.
-samba_class=sambaSamAccount
-secmode=0
-other_class=inetOrgPerson
+imap_def=0
 samba_def=0
-given_order=0
-multi_fields=0
-person=1
 samba_gclass=sambaGroup
+alias_same=0
+quota_support=0
+multi_fields=0
+other_class=inetOrgPerson
+imap_login=cyrus
 given=0
+slappasswd=slappasswd
+imap_folders=old       public  sent-mail
 auth_ldap=/etc/ldap.conf
+secmode=0
+imap_class=SuSEeMailObject
+samba_class=sambaSamAccount
+md5=0
+gecos=1
 ldap_tls=0
-quota_support=0
+imap_foldersep=.
+person=1
+given_order=0
index 8324b36582bd4491211958b5b77f6db0c7c7beb5..a89625b05ef2d98a89d64d613a16d940792ea470 100644 (file)
@@ -1,4 +1,4 @@
+logrotate_conf=/etc/logrotate.conf
+logrotate=logrotate
 sort_mode=0
 add_file=/etc/logrotate.d
-logrotate=logrotate
-logrotate_conf=/etc/logrotate.conf
index 41931f9c629220612e2b77c4d2843c3bf2d78575..4083481f833d8e4c72ffc04d7f4a65282997beb0 100644 (file)
@@ -1,17 +1,17 @@
-sort_mode=0
-model_path=/usr/share/foomatic/db /usr/share/ppd
+gs_lib=
+driver_style=cups
 show_status=0
 spool_dir=/var/spool/cups
-gs_fontpath=
-smbclient_path=smbclient
+model_path=/usr/share/foomatic/db /usr/share/ppd
+iface_owner=lp:lp
 stop_cmd=/etc/init.d/cupsys stop
-print_style=cups
+smbclient_path=smbclient
+gs_fontpath=
 display_mode=0
-iface_arg=
 iface_perms=755
 gs_path=gs
-iface_owner=lp:lp
-gs_lib=
-show_jobs=0
-driver_style=cups
 start_cmd=/etc/init.d/cupsys start
+print_style=cups
+show_jobs=0
+sort_mode=0
+iface_arg=
index 911271b934a61f6130c73010f2d34b55a0696b2e..32a8fcfa96cbfe5b760ed39b04f51376d30b640f 100644 (file)
@@ -1,52 +1,52 @@
-view_html=0
-sync_create=0
-log_read=0
-mail_system=3
-show_unread=0
-ignore_users=
-from_virtualmin=1
-mail_file=Mailbox
-sig_file=*
-auto=1
-mailbox_user=.usermin/mailbox
+show_to=0
+size_mode=1
 html_edit=0
-wrap_width=80
-column_count=4
 vpopmail_dir=/home/vpopmail
-show_count=0
-track_read=0
-check_mod=1
-maildir_deleted=0
-show_sent=0
-mail_usermin=mail
-show_size=1
-spam_report=
-size_mode=1
-noindex_hostname=0
-no_orig_ip=0
-show_to=0
-mail_dir=Maildir
-arrows=1
-sync_delete=1
 sort_mode=1
-max_records=200
-perpage=20
-fwd_mode=0
-link_mode=0
-show_delall=0
-top_buttons=2
+log_read=0
+noindex_hostname=0
+show_mail=0
+show_size=1
 no_mailer=0
+mail_system=3
+fwd_mode=0
+no_orig_ip=0
+view_html=0
 no_crlf=0
-ignore_users_enabled=0
-delete_warn=y
-spam_del=0
-sync_perms=0700
-spam_buttons=mail
-html_quote=0
-mail_style=0
+show_sent=0
+sync_create=0
+top_buttons=2
 show_size_below=0
 show_body=0
+ignore_users_enabled=0
 sync_modify=1
-show_mail=0
+mail_usermin=mail
+mail_style=0
+show_count=0
+column_count=4
+delete_warn=y
+link_mode=0
+show_delall=0
+mail_dir=Maildir
+spam_buttons=mail
+check_mod=1
+wrap_width=80
+perpage=20
+spam_del=0
+track_read=0
+arrows=1
+from_virtualmin=1
+sig_file=*
+show_unread=0
 open_mode=0
+ignore_users=
 date_fmt=dmy
+mail_file=Mailbox
+html_quote=0
+sync_perms=0700
+spam_report=
+mailbox_user=.usermin/mailbox
+sync_delete=1
+max_records=200
+maildir_deleted=0
+auto=1
index 5c92e35aba1db212e7d830edbfe9f5588090edcd..04244bd1bfdfbb267fafe0d4820c1a7ce290bb03 100644 (file)
@@ -1,9 +1,9 @@
-man2html_path=man2html
 man_cmd_sect=man SECTION PAGE
-search_cmd=man -k PAGE
-man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
-list_cmd_sect=man -w SECTION PAGE
-kernel_dir=/usr/src/linux/Documentation
 list_cmd=man -w PAGE
-doc_dir=/usr/share/doc
+kernel_dir=/usr/src/linux/Documentation
 man_cmd=man PAGE
+doc_dir=/usr/share/doc
+man2html_path=man2html
+search_cmd=man -k PAGE
+list_cmd_sect=man -w SECTION PAGE
+man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
index 0f05c775b78b4e55aed715af9d9b7bd492af3e44..4f6de343f1eee7ca31fc37e3fcbdca3e8f7c45b3 100644 (file)
@@ -1,6 +1,4 @@
 port=10000
-root=/usr/share/webmin
-mimetypes=/usr/share/webmin/mime.types
 addtype_cgi=internal/cgi
 realm=Webmin Server
 logfile=/var/webmin/miniserv.log
@@ -27,7 +25,6 @@ syslog=1
 ipv6=1
 session=1
 premodules=WebminCore
-server=MiniServ/1.900
 userfile=/etc/webmin/miniserv.users
 keyfile=/etc/webmin/miniserv.pem
 passwd_file=/etc/shadow
@@ -43,3 +40,6 @@ logout_script=/etc/webmin/logout.pl
 failed_script=/etc/webmin/failed.pl
 cipher_list_def=1
 sudo=1
+root=/usr/share/webmin
+mimetypes=/usr/share/webmin/mime.types
+server=MiniServ/1.910
index 9917b7b935361ffebb2c6307eebbf0017289b938..7de4cf14fed6db19a1c9154769ec068673a8b7c4 100644 (file)
@@ -1,7 +1,7 @@
-mon_cgi=/var/www/cgi-bin/mon.cgi
+start_cmd=/etc/init.d/mon start
+restart_cmd=/etc/init.d/mon restart
 pid_file=/var/run/mon.pid
+stop_cmd=/etc/init.d/mon stop
 cfbasedir=/etc/mon
-restart_cmd=/etc/init.d/mon restart
 monshow=/usr/bin/monshow
-stop_cmd=/etc/init.d/mon stop
-start_cmd=/etc/init.d/mon start
+mon_cgi=/var/www/cgi-bin/mon.cgi
index e3805715a61a6ef434235a7c7326fdd0ddcd9df5..12e032e599cd663409c5f19afab290efcd36bf5a 100644 (file)
@@ -1,8 +1,8 @@
+autofs_file=/etc/auto.master
+nfs_check=1
+smbclient_path=smbclient
+fstab_file=/etc/fstab
+long_fstypes=1
 auto_file=/etc/am-utils/amd.conf
 show_used=1
-fstab_file=/etc/fstab
 nmblookup_path=nmblookup
-smbclient_path=smbclient
-long_fstypes=1
-autofs_file=/etc/auto.master
-nfs_check=1
index 9bceec1fec4e9f5dfd00e51f9c65b4fd7af29231..9d456c02eabe79d0a3a628519d953c79db277363 100644 (file)
@@ -1,23 +1,23 @@
+nopwd=0
+mysqladmin=/usr/bin/mysqladmin
+stop_cmd=service mysql stop
+mysql_libs=/usr/local/mysql/lib
 mysqlimport=/usr/bin/mysqlimport
-start_cmd=service mysql start
-mysql_data=/var/lib/mysql
 max_text=1000
-date_subs=0
-mysqldump=/usr/bin/mysqldump
-mysqladmin=/usr/bin/mysqladmin
-nopwd=0
+nodbi=0
 add_mode=1
-max_dbs=50
-login=root
-mysqlshow=/usr/bin/mysqlshow
-blob_mode=0
-stop_cmd=service mysql stop
-perpage=25
-mysql=/usr/bin/mysql
-access=*: *
 webmin_subs=0
-nodbi=0
-mysql_libs=/usr/local/mysql/lib
+date_subs=0
+mysqldump=/usr/bin/mysqldump
 my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
+mysqlshow=/usr/bin/mysqlshow
+login=root
+max_dbs=50
+mysql_data=/var/lib/mysql
 style=0
+start_cmd=service mysql start
+perpage=25
 passwd_mode=0
+blob_mode=0
+access=*: *
+mysql=/usr/bin/mysql
diff --git a/webmin/mysql/version b/webmin/mysql/version
new file mode 100644 (file)
index 0000000..83cb14c
--- /dev/null
@@ -0,0 +1 @@
+5.7.26
index 788de1c2a328d46d3beb32c77d3332ec2ffb740d..e232bee72ac1a642f86bc8356c22a09f3aa1eeb3 100644 (file)
@@ -1,5 +1,5 @@
-securenets=/etc/ypserv.securenets
-max_size=100
 client_conf=/etc/yp.conf
+securenets=/etc/ypserv.securenets
 nsswitch_conf=/etc/nsswitch.conf
+max_size=100
 manual_build=0
index 2c57c7ef22943318be2510cc56cfa6282fa2a0bd..bd9a99f6a1a0747829f52601349639296fa08f05 100644 (file)
@@ -1,5 +1,5 @@
-slpd_pid=/var/run/slpd.pid
 slpd=/usr/sbin/slpd
-slpd_reg=/etc/slp.reg
+slpd_pid=/var/run/slpd.pid
 slpd_conf=/etc/slp.conf
+slpd_reg=/etc/slp.reg
 slpd_log=/var/log/slpd.log
index 226c127d1632e46e5caeb7b0b55aff051b351642..195d872e7272f7216056aa344a080b36cb709aad 100644 (file)
@@ -1,2 +1,2 @@
-cache_time=6
 update_multiple=1
+cache_time=6
index 4287bf606316a23346c46b9335488be3d89c3fe1..36ec929aa45b4e97c1a32e10b7f14846c921c741 100644 (file)
@@ -1,4 +1,4 @@
+ignore=README
 lib_dirs=/lib/security /lib/*/security
 mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so
 pam_dir=/etc/pam.d
-ignore=README
index 2a031ebf196dd9a591833336fa43db1b1a620aa6..d10864c0d816d3788f0b9ddd96053cb92b5f098c 100644 (file)
@@ -1,8 +1,8 @@
-dialin_config=/etc/mgetty+sendfax/dialin.config
-mgetty=mgetty
-login_config=/etc/mgetty+sendfax/login.config
 ppp_options=/etc/ppp/options
-encrypt_pass=0
 pppd=pppd
-serials=/dev/ttyS[0-9]*
+login_config=/etc/mgetty+sendfax/login.config
+mgetty=mgetty
 pap_file=/etc/ppp/pap-secrets
+encrypt_pass=0
+dialin_config=/etc/mgetty+sendfax/dialin.config
+serials=/dev/ttyS[0-9]*
index 48a8abd89e1f4acf06aca55e20da65cf301490f0..34eb374584bbfeda0e4b4a709686e212ec9ae384 100644 (file)
@@ -1,28 +1,28 @@
-fwd_mode=0
-postfix_aliases_table_command=/usr/sbin/postalias
-postfix_control_command=/usr/sbin/postfix
-postcat_cmd=/usr/sbin/postcat
+prefix_cmts=0
+postfix_master=/etc/postfix/master.cf
+delete_confirm=1
+columns=2
+mailq_dir=/var/spool/postfix
+postfix_queue_command=postqueue
+top_buttons=1
+postfix_lookup_table_command=/usr/sbin/postmap
+check_config=1
+delete_warn=1
+postfix_config_file=/etc/postfix/main.cf
 max_records=200
+postcat_cmd=/usr/sbin/postcat
 postfix_config_command=/usr/sbin/postconf
-ldap_doms=0
-perpage=20
+mailq_count=0
 postfix_super_command=/usr/sbin/postsuper
-check_config=1
-mailq_cmd=postqueue -p
+mailq_sort=0
 index_check=1
 sort_mode=0
-postfix_queue_command=postqueue
-columns=2
-mailq_dir=/var/spool/postfix
-show_cmts=0
-postfix_config_file=/etc/postfix/main.cf
-mailq_sort=0
-prefix_cmts=0
-mailq_count=0
-delete_confirm=1
+postfix_aliases_table_command=/usr/sbin/postalias
 postfix_newaliases_command=/usr/bin/newaliases
-top_buttons=1
-delete_warn=1
-postfix_lookup_table_command=/usr/sbin/postmap
-postfix_master=/etc/postfix/master.cf
+postfix_control_command=/usr/sbin/postfix
+show_cmts=0
+fwd_mode=0
 wrap_width=80
+ldap_doms=0
+perpage=20
+mailq_cmd=postqueue -p
index f065360635eae8b8489f62e53d7572b2cacfcc8f..0cb8fc59a9813be4d066381af30909b6510865f8 100644 (file)
@@ -1,24 +1,24 @@
-rstr_cmd=/usr/bin/pg_restore
+perpage=25
 start_cmd=/etc/init.d/postgresql* start
+simple_sched=0
+access=*: *
+dump_cmd=/usr/bin/pg_dump
+blob_mode=0
+date_subs=0
+style=0
+login=postgres
+max_dbs=50
+basedb=template1
 psql=/usr/bin/psql
-plib=
 pass=
+webmin_subs=0
+add_mode=1
 max_text=1000
-date_subs=0
-dump_cmd=/usr/bin/pg_dump
+nodbi=0
+sameunix=1
 pid_file=/var/run/postmaster.pid
-add_mode=1
-max_dbs=50
+rstr_cmd=/usr/bin/pg_restore
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
 stop_cmd=/etc/init.d/postgresql* stop
-login=postgres
-blob_mode=0
-sameunix=1
-perpage=25
-access=*: *
-simple_sched=0
-webmin_subs=0
-nodbi=0
 access_own=0
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
-style=0
-basedb=template1
+plib=
index e0a3e10a857590a0f59e8fa47f3071c334a71acf..54849d0a2d50dbd647511d3bc258b5ca08882881 100644 (file)
@@ -1,3 +1,3 @@
-file=/etc/wvdial.conf
 wvdialconf=wvdialconf
 wvdial=wvdial
+file=/etc/wvdial.conf
index 07293f7d6dd028594641a84e25cce85ee0dd9397..75334adc47ae5dfc0bb45d12e89bdd303e79aafd 100644 (file)
@@ -1,5 +1,5 @@
-pap_file=/etc/ppp/chap-secrets
-timeout=30
 pptp=pptp
-peers_dir=/etc/ppp/peers
 pptp_options=/etc/ppp/options.pptp
+pap_file=/etc/ppp/chap-secrets
+peers_dir=/etc/ppp/peers
+timeout=30
index 6ead1359b7bb62d05830ecee5a776af78f8053a7..058c834e38a87a135035504d1e5093340cc0841c 100644 (file)
@@ -1,9 +1,9 @@
-stop_cmd=/etc/init.d/pptpd stop
-start_cmd=/etc/init.d/pptpd start
-pap_file=/etc/ppp/chap-secrets
-pptpd=pptpd
-log_file=/var/log/messages
 pptp_ppp_options=/etc/ppp/pptpd-options
-ppp_options=/etc/ppp/options
+pap_file=/etc/ppp/chap-secrets
 pid_file=/var/run/pptpd.pid
 file=/etc/pptpd.conf
+log_file=/var/log/messages
+ppp_options=/etc/ppp/options
+stop_cmd=/etc/init.d/pptpd stop
+start_cmd=/etc/init.d/pptpd start
+pptpd=pptpd
index 5790025ce01eb04992d1e1ccce28b466e0a2c1c0..c0f2c3f16bbe7c90d37f1c5eb1ab99ba2bbde12e 100644 (file)
@@ -1,6 +1,6 @@
 hide_self=1
-base_ppid=1
+cut_length=80
 default_mode=last
 ps_style=linux
-cut_length=80
 trace_java=0
+base_ppid=1
index 5dae99ba1c64532f21a24a1d6b9df945fe3c706a..d5df9474966c0743f17ed9c89f8934691d577bc9 100644 (file)
@@ -1,3 +1,3 @@
-procmail=procmail
 includes=0
 procmailrc=/etc/procmailrc
+procmail=procmail
index 5e69a1bcabf8c4c48a79d0b0f32e20862d936145..a43f6f5b45a9e3e0538c636c19760e21064903f3 100644 (file)
@@ -1,9 +1,9 @@
-test_manual=0
-proftpd_path=/usr/sbin/proftpd
-test_config=1
-start_cmd=/etc/init.d/proftpd start
 stop_cmd=/etc/init.d/proftpd stop
 proftpd_conf=/etc/proftpd/proftpd.conf
 pid_file=/var/run/proftpd.pid
 test_always=0
+test_manual=0
+proftpd_path=/usr/sbin/proftpd
+start_cmd=/etc/init.d/proftpd start
+test_config=1
 ftpusers=/etc/ftpusers
index 1129c0945c735c1ce39fc4abc03f0f6784287eeb..a5b651407f12cc507724467d016dbdb666c2dc65 100644 (file)
@@ -1,14 +1,14 @@
-mail_dir_qmail=Maildir
-fwd_mode=0
-mail_file=Mailbox
-qmail_dir=/var/qmail
-mailq_sort=0
-perpage=20
-mail_system=1
-max_records=200
 sort_mode=0
+mail_file=Mailbox
 index_min=1000000
+mailq_sort=0
+qmail_dir=/var/qmail
 mail_dir=
-mailq_count=0
-delete_warn=1
 columns=2
+max_records=200
+fwd_mode=0
+mail_system=1
+delete_warn=1
+mail_dir_qmail=Maildir
+mailq_count=0
+perpage=20
index 39045ca2122e15a07f35fa05143bf4f7c624398d..d14f65d8452228e028d310ec716d870178d06528 100644 (file)
@@ -1,25 +1,25 @@
+block_mode=1
 block_size=1024
+user_quotaoff_command=quotaoff -u
 group_quotaoff_command=quotaoff -g
+user_copy_command=edquota -u -p
+group_edquota_command=edquota -g
+show_grace=1
+pc_show=1
+sort_mode=0
+hide_uids=0
 display_max=100
-quotacheck_command=quotacheck -u -g
-user_quotaon_command=quotaon -u
-group_copy_command=edquota -g -p
-group_quota_command=quota -v -g
-block_mode=1
 group_grace_command=edquota -g -t
+email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
+group_quota_command=quota -v -g
+user_repquota_command=repquota -u -v
 group_repquota_command=repquota -g -v
-group_setquota_command=setquota -g
 user_setquota_command=setquota -u
-hide_uids=0
-user_grace_command=edquota -u -t
+group_setquota_command=setquota -g
 group_quotaon_command=quotaon -g
-user_copy_command=edquota -u -p
-user_repquota_command=repquota -u -v
-show_grace=1
-sort_mode=0
-user_quota_command=quota -v -u
-user_quotaoff_command=quotaoff -u
-group_edquota_command=edquota -g
+group_copy_command=edquota -g -p
+user_grace_command=edquota -u -t
 user_edquota_command=edquota -u
-pc_show=1
-email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
+user_quota_command=quota -v -u
+quotacheck_command=quotacheck -u -g
+user_quotaon_command=quotaon -u
index 4bd2da90edf6465683e2291abe2c316b200fd9c3..76eb03452f9f351e390ae70dd45eb51ef48759a4 100644 (file)
@@ -1,3 +1,3 @@
-mdstat=/proc/mdstat
-raidtab=/etc/raidtab
 mdadm=/etc/mdadm/mdadm.conf
+raidtab=/etc/raidtab
+mdstat=/proc/mdstat
index aa70ba6de2aa0aed98c4153db119728ca73af67d..a6d3ecd88ee81d8dfc8c2d60d65f45d640d2cff9 100644 (file)
@@ -1,18 +1,18 @@
-samba_password_program=/usr/bin/smbpasswd
-net=/usr/bin/net
-smbgroupedit=/usr/bin/smbgroupedit
-start_cmd=service smbd start ; service nmbd start
+stop_cmd=service smbd stop ; service nmbd stop
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
 samba_status_program=/usr/bin/smbstatus
+restart_cmd=service smbd restart ; service nmbd restart
+smbgroupedit=/usr/bin/smbgroupedit
 smb_passwd=/etc/samba/smbpasswd
+swat=/usr/sbin/swat
 smb_conf=/etc/samba/smb.conf
-list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
 dont_convert=-499
-swat=/usr/sbin/swat
-stop_cmd=service smbd stop ; service nmbd stop
-samba_server=/usr/sbin/smbd
-run_from_inetd=0
 name_server=/usr/sbin/nmbd
-text_lists=0
-restart_cmd=service smbd restart ; service nmbd restart
 pdbedit=/usr/bin/pdbedit
+net=/usr/bin/net
+text_lists=0
+samba_server=/usr/sbin/smbd
 sort_mode=0
+start_cmd=service smbd start ; service nmbd start
+run_from_inetd=0
+samba_password_program=/usr/bin/smbpasswd
index f7f7c13dea7b327fe0a64bc2b58b7cc14ad5405c..f11d82346f1619c93ec86416f7a394ad4879a1dd 100644 (file)
@@ -1,4 +1,4 @@
-sarg_conf=/etc/sarg/sarg.conf
-sarg=sarg
 clear=1
 naked=0
+sarg=sarg
+sarg_conf=/etc/sarg/sarg.conf
index e0f5a61c81a040326ddc6e16746a2c43215f2301..76b836a8d08f8f9a2a8deafe231fb909e0add118 100644 (file)
@@ -1,30 +1,30 @@
-order_mail=0
-top_buttons=1
-makemap_path=makemap
-delete_warn=1
-wrap_width=80
-sendmail_path=/usr/lib/sendmail
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-mailq_count=0
-index_min=1000000
+mail_dir=/var/spool/mail
+smrsh_dir=/etc/smrsh
+show_to=0
+sort_mode=0
+mailq_sort=0
 track_read=0
-delete_confirm=1
+sendmail_path=/usr/lib/sendmail
+perpage=20
+wrap_width=80
+makemap_path=makemap
+fwd_mode=0
 mail_type=0
-mail_style=0
-sendmail_command=/usr/lib/sendmail -bd -q1h
-mailq_sort=0
-prefix_cmts=0
+sendmail_pid=/var/run/sendmail/mta/sendmail.pid
 show_cmts=0
-show_to=0
-columns=2
-smrsh_dir=/etc/smrsh
-mail_dir=/var/spool/mail
+top_buttons=1
 mailq_show=Date,From,To,Size,Status
-sendmail_cf=/etc/mail/sendmail.cf
-sort_mode=0
+order_mail=0
+columns=2
 sendmail_features=/usr/share/sendmail/cf
-max_records=200
-perpage=20
 mail_file=mbox
-fwd_mode=0
+delete_confirm=1
+sendmail_cf=/etc/mail/sendmail.cf
+prefix_cmts=0
+index_min=1000000
+sendmail_command=/usr/lib/sendmail -bd -q1h
 sendmail_mc=/etc/mail/sendmail.mc
+mailq_count=0
+mail_style=0
+max_records=200
+delete_warn=1
index 58c7d0275a04f490d158afa0afe2712773e19b49..f521e92763f0b21dc24cec1f11168809691bd52d 100644 (file)
@@ -1,11 +1,11 @@
-scan_time=5
-deflink=0
+display_mode=0
 show_ip=0
+deflink=0
 groups_dir=/etc/cluster/groups
-capath=/usr/share/ca-certificates
-deffast=2
-show_status=1
 sort_mode=0
-resolve=1
 max_servers=100
-display_mode=0
+deffast=2
+resolve=1
+show_status=1
+capath=/usr/share/ca-certificates
+scan_time=5
index af7728831e58d76091c50db3b4a3530a728c3e6e..044e158ce7275da152f8c1d257357e6a87fedd07 100644 (file)
@@ -1,3 +1,3 @@
-max_runtime=86400
 clear_envs=0
 max_output=100000
+max_runtime=86400
index 27cbead5c5aacc6db4383851a9d50cc0e82ae2f3..e40988a1d72fc9b3693ec1b89e63e75dd5f06d66 100644 (file)
@@ -1,5 +1,5 @@
+display_zone_descriptions=1
+shorewall=shorewall
 actions=/etc/shorewall/actions /usr/share/shorewall/actions.std
 macros=/usr/share/shorewall
-display_zone_descriptions=1
 config_dir=/etc/shorewall
-shorewall=shorewall
index c84514764c0261ed44efc1fa1de8135afef18f56..17b47d5d539635041b98baa1087913bfeb447d4a 100644 (file)
@@ -1,5 +1,5 @@
-shorewall6=shorewall6
 macros=/usr/share/shorewall6
+shorewall6=shorewall6
+config_dir=/etc/shorewall6
 actions=/etc/shorewall6/actions        /usr/share/shorewall6/actions.std
 display_zone_descriptions=1
-config_dir=/etc/shorewall6
index 9d48dc7743671d14b6e8dc9550821bc27bc02c35..8d9d9bb970126a6eee0d719b7d6bb7a533d776d7 100644 (file)
@@ -1,4 +1,4 @@
-ata=0
-attribs=1
 smartctl=smartctl
+attribs=1
 mode=1
+ata=0
index abefc9ae10ef073282f7793f269ef7d75d3798f0..facec37dd297c4c87babc80ce18b0671c48dbc9b 100644 (file)
@@ -1,3 +1,3 @@
-apt_mode=0
 package_system=debian
+apt_mode=0
 update_system=apt
index 09a58111a2407baca3d1bd2b4bf2c655f3cc53e4..18d21b7f7b8a1a24a96815e348664aca88f3c437 100644 (file)
@@ -1,12 +1,12 @@
-spamassassin=spamassassin
 mode=0
-local_cf=/etc/spamassassin/local.cf
-max_awl=200
-processes=spamd amavisd
-addto=0
-call_spam=1
 procmailrc=/etc/procmailrc
-warn_procmail=1
+call_spam=1
 sa_learn=sa-learn
-procmail_cmd=*
 restart_cmd=/etc/init.d/spamassassin restart
+warn_procmail=1
+max_awl=200
+addto=0
+spamassassin=spamassassin
+processes=spamd amavisd
+procmail_cmd=*
+local_cf=/etc/spamassassin/local.cf
index bc8a01797f588a9ccd0a36f1d374e4efa09c18e0..eff5adae13cf06696260be802c73799006f1e77b 100644 (file)
@@ -1,21 +1,21 @@
+restart_pos=0
 sort_conf=0
 squid_restart=service squid reload
-squid_conf=/etc/squid/squid.conf
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+squidclient=squidclient
+cache_dir=/var/spool/squid
 log_dir=/var/log/squid
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+sync_modify=1
+squid_stop=service squid stop
 sync_delete=0
-cache_dir=/var/spool/squid
-restart_pos=0
 sync_create=0
+cal_args=-aw
+pid_file=/var/run/squid.pid
+cal_all=1
+crypt_conf=0
+squid_conf=/etc/squid/squid.conf
 squid_start=service squid start
-squidclient=squidclient
 calamaris=calamaris
-cal_all=1
-squid_stop=service squid stop
-sync_modify=1
-pid_file=/var/run/squid.pid
 cal_fmt=w
-cal_max=50000
-cal_args=-aw
 squid_path=squid
-crypt_conf=0
+cal_max=50000
index 97cfb082a1ed94285580df5f1a34ff054d591739..72ca4d7c9d5697b0e90102bc62b6180fd04fc1bf 100644 (file)
@@ -1,11 +1,11 @@
-sync_auth=1
-sshd_config=/etc/ssh/sshd_config
 keygen_path=/usr/bin/ssh-keygen
-stop_cmd=service ssh stop
 start_cmd=service ssh start
-client_config=/etc/ssh/ssh_config
-pid_file=/var/run/sshd.pid
-sync_pass=0
 sshd_path=/usr/sbin/sshd
+sshd_config=/etc/ssh/sshd_config
+pid_file=/var/run/sshd.pid
 sync_create=0
+stop_cmd=service ssh stop
+sync_pass=0
+sync_auth=1
 sync_gnupg=0
+client_config=/etc/ssh/ssh_config
index 486fe46edbedaeb6c4c5e8257f54c5ac27715a0c..7dd34beac35329acf84e45172bffe46356ae9607 100644 (file)
@@ -1,13 +1,13 @@
-pager_cmd=sms_client
-snmp_trap=1.3.6.1.4.1.10000.1.1
-subject_mode=0
-sort_mode=0
-sysinfo=0
-columns=2
+history_purge=30
 sched_offset=0
+sort_mode=0
 index_status=1
+columns=2
 sysinfo_users=0
-snmp_version=2
+subject_mode=0
 output=0
 history_show=50
-history_purge=30
+snmp_trap=1.3.6.1.4.1.10000.1.1
+pager_cmd=sms_client
+snmp_version=2
+sysinfo=0
index 0dc9ea4dc768f0fc23fa9f8cdeae33485824a2f3..edcfc00424127cc13e633a33d11f5437675cef0d 100644 (file)
@@ -1,7 +1,7 @@
-pid_file=/var/run/syslog-ng.pid
 syslogng_conf=/etc/syslog-ng/syslog-ng.conf
-syslogng_cmd=syslog-ng
-compressed=1
 stop_cmd=/etc/init.d/syslog-ng stop
 start_cmd=/etc/init.d/syslog-ng start
+pid_file=/var/run/syslog-ng.pid
+syslogng_cmd=syslog-ng
+compressed=1
 lines=20
index 25197e1b8be6ae3aa678cac469b47425f010851e..b398d80f869b127f5704e75cc5b7f0acf09c0f5f 100644 (file)
@@ -1,19 +1,19 @@
-pipe=1
-syslogd=/usr/sbin/rsyslogd
-tags=0
 restart_cmd=/usr/sbin/service rsyslog restart
-syslog_conf=/etc/rsyslog.conf
-pri_all=1
-m4_conf=0
-socket=0
-compressed=1
-signal_cmd=/usr/sbin/service rsyslog restart
-facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-reverse=0
+others=1
+syslogd=/usr/sbin/rsyslogd
 pid_file=/var/run/rsyslogd.pid
-m4_path=
+pri_all=1
+tags=0
 lines=20
-others=1
+pipe=1
 pri_dir=1
+signal_cmd=/usr/sbin/service rsyslog restart
 sync=1
+facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
+compressed=1
+m4_conf=0
+syslog_conf=/etc/rsyslog.conf
+m4_path=
 start_cmd=/usr/sbin/service rsyslog start
+reverse=0
+socket=0
index c627a9fec943a9bb9cf121b1f02e78452fb485a9..b6a7e4155594fba9d042e3e77f367757be828a52 100644 (file)
@@ -1,2 +1,2 @@
-collect_pkgs=1
 collect_interval=5
+collect_pkgs=1
index ddc301405565123c9c63a9fc35dffb71db7bd9e6..bfd2d19d4140fa68e5a79cb5815e51fc74aac58a 100644 (file)
@@ -1,3 +1,3 @@
-hosts_allow=/etc/hosts.allow
 inetd_services=0
+hosts_allow=/etc/hosts.allow
 hosts_deny=/etc/hosts.deny
index 7c41156d3ef32bf24bf7f5926e5c73eb1c34c592..a591e9aa01d689ce8c513246400a5840b46ce13f 100644 (file)
@@ -1,5 +1,5 @@
-detach=0
 proxy=0
-no_test=0
-sizemode=0
 mode=1
+sizemode=0
+no_test=0
+detach=0
index 554b9144af4b37ab05c8025d0b871288f4b5724f..f67f05d2809466752dcae4ceab2b69f3a91fd547 100644 (file)
@@ -1,5 +1,5 @@
-timeserver_hardware=1
-lease=5
-ntp_only=1
 seconds=1
+ntp_only=1
 zone_style=linux
+lease=5
+timeserver_hardware=1
index 1c7534ae334dc2a853fbb7a0cab6a997871a0896..aba856c09d6e81e770b5573cbc3556fcf9f83006 100644 (file)
@@ -1,4 +1,4 @@
-dir=/
+ddir=/
 duser=root
+dir=/
 user=root
-ddir=/
index ffbfce8eca8caef6780f77fefc8ee9880745d961..9484cdbdf76deec6240d5bc00112efd9e53454c1 100644 (file)
@@ -1,41 +1,41 @@
-empty_mode=0
-random_password=0
-home_style=0
-uid_mode=1
-delete_root=0
-passwd_same=0
-passwd_file=/etc/passwd
-extra_real=0
-passwd_progmode=0
 delete_only=0
-email_type=0
-default_group=users
-membox=0
 display_max=400
-passwd_dict=0
-new_user_gid=0
+email_type=0
 uid_calc=0
-passwd_stars=0
+extra_real=0
+secmode=0
 selinux_con=user_u:object_r:user_home_dir_t
-md5=1
-gid_calc=0
-new_user_group=0
-group_file=/etc/group
 skip_md5=0
-gshadow_file=/etc/gshadow
-homedir_perms=0755
+passwd_file=/etc/passwd
+shadow_file=/etc/shadow
+default_group=users
+md5=1
+passwd_same=0
+passwd_dict=0
+membox=0
+delete_root=0
 shells=fixed,passwd,shells
+gshadow_file=/etc/gshadow
+default_other=1
+empty_mode=0
+last_show=0
+user_files=/etc/skel
+alias_check=0
+home_style=0
+group_file=/etc/group
 lock_string=*
+passwd_stars=0
+uid_mode=1
 sort_mode=0
-base_uid=1000
-secmode=0
-shadow_file=/etc/shadow
-user_files=/etc/skel
-home_base=/home
+gid_calc=0
+random_password=0
+new_user_gid=0
+from_files=0
+display_mode=1
+homedir_perms=0755
+passwd_progmode=0
 gid_mode=1
+base_uid=1000
+new_user_group=0
 base_gid=1000
-default_other=1
-display_mode=1
-last_show=0
-from_files=0
-alias_check=0
+home_base=/home
index 6ca56269646375a1bae5c254ed1ccf546d8fe407..ecb0aaaa3854773ad4ca550129ab4142c1e7e0ed 100644 (file)
@@ -1,7 +1,7 @@
+upmissing=0
 updays=1
+upshow=1
 uphour=4
 cron_mode=0
-upmissing=0
-upshow=1
-update=0
 usermin_dir=/etc/usermin
+update=0
index 3c69c6b5b77b89824f3d7c60d2375d67996ffc15..1e4261e94aa620c7c91019f28d912647b475d9c3 100644 (file)
@@ -1 +1 @@
-1.900
+1.910
index 00f79ad34d13757135b33eaf85df0fed3a34620c..bb4eec4d2f0a182ed079cffa2fe0fa7d4eef0d14 100644 (file)
@@ -1,2 +1,2 @@
-vgetty_config=/etc/mgetty+sendfax/voice.conf
 vgetty_cmd=vgetty
+vgetty_config=/etc/mgetty+sendfax/voice.conf
index af92004abea4ae8d62877864607914eb4104a525..55d25e155978ba6694b20cb872e13d89e78dcad2 100644 (file)
@@ -1,6 +1,6 @@
-webalizer=/usr/bin/webalizer
-webalizer_conf=/etc/webalizer/webalizer.conf
-alt_conf=/etc/webalizer/webalizer.conf.sample
 skip_old=0
-naked=0
 auto=apache,squid,proftpd,wuftpd
+naked=0
+webalizer_conf=/etc/webalizer/webalizer.conf
+webalizer=/usr/bin/webalizer
+alt_conf=/etc/webalizer/webalizer.conf.sample
index cf4422c506677932f315cf883e4f99b5438d5e68..db9b7b20f9ca09341cc202112c7e49e930575599 100644 (file)
@@ -1,9 +1,9 @@
-warn_days=7
-cron_mode=0
 updays=1
-osdn=1
-update=0
-upmissing=0
 upshow=1
-uphour=14
 upmins=34
+upmissing=0
+warn_days=7
+update=0
+uphour=14
+osdn=1
+cron_mode=0
index fa85ad77452dfa78d6774a3607d965a5e8c7a8a3..62123ad0f97870a14f805fd2142c6d32b4d905a5 100644 (file)
@@ -1,8 +1,8 @@
-ftphosts=/etc/wu-ftpd/ftphosts
-ftpgroups=/etc/wu-ftpd/ftpgroups
-log_file=/var/log/xferlog
 ftpconversions=/etc/wu-ftpd/ftpconversions
-ftpd_path=/usr/sbin/wu-ftpd
-ftpaccess=/etc/wu-ftpd/ftpaccess
-ftpusers=/etc/wu-ftpd/ftpusers
 pid_file=/var/run/ftpd.pids-all
+log_file=/var/log/xferlog
+ftpgroups=/etc/wu-ftpd/ftpgroups
+ftpusers=/etc/wu-ftpd/ftpusers
+ftphosts=/etc/wu-ftpd/ftphosts
+ftpaccess=/etc/wu-ftpd/ftpaccess
+ftpd_path=/usr/sbin/wu-ftpd
index 14054cfe79d5218e04cf9f3dc67cb4af946a4b6e..03f286053ba288e85c96bdcd2802920734cda5cc 100644 (file)
@@ -1,5 +1,5 @@
-start_cmd=/etc/init.d/xinetd start
-protocols_file=/etc/protocols
 lookup_servs=1
-pid_file=/var/run/xinetd.pid
+protocols_file=/etc/protocols
+start_cmd=/etc/init.d/xinetd start
 xinetd_conf=/etc/xinetd.conf
+pid_file=/var/run/xinetd.pid