]> git.hoellein.online Git - vserver/commitdiff
committing changes in /etc made by "apt-get upgrade"
authormhoellein <mario@hoellein.online>
Wed, 1 Jun 2022 11:49:55 +0000 (13:49 +0200)
committermhoellein <mario@hoellein.online>
Wed, 1 Jun 2022 11:49:55 +0000 (13:49 +0200)
Package changes:
-dpkg 1.19.7ubuntu3 amd64
-dpkg-dev 1.19.7ubuntu3 all
+dpkg 1.19.7ubuntu3.2 amd64
+dpkg-dev 1.19.7ubuntu3.2 all
-kmod 27-1ubuntu2 amd64
+kmod 27-1ubuntu2.1 amd64
-libcups2 2.3.1-9ubuntu1.1 amd64
+libcups2 2.3.1-9ubuntu1.2 amd64
-libdpkg-perl 1.19.7ubuntu3 all
+libdpkg-perl 1.19.7ubuntu3.2 all
-libkmod2 27-1ubuntu2 amd64
+libkmod2 27-1ubuntu2.1 amd64
-libpq5 12.10-0ubuntu0.20.04.1 amd64
+libpq5 12.11-0ubuntu0.20.04.1 amd64
-linux-libc-dev 5.4.0-110.124 amd64
+linux-libc-dev 5.4.0-113.127 amd64
-webmin 1.991 all
+webmin 1.994 all

110 files changed:
.etckeeper
init.d/webmin [deleted file]
letsencrypt/.certbot.lock [new file with mode: 0644]
systemd/system/multi-user.target.wants/webmin.service [new symlink]
webmin/.reload-init [new file with mode: 0755]
webmin/.restart-by-force-kill-init [new file with mode: 0755]
webmin/.restart-init [new file with mode: 0755]
webmin/.start-init [new file with mode: 0755]
webmin/.stop-init [new file with mode: 0755]
webmin/acl/config
webmin/adsl-client/config
webmin/ajaxterm/config
webmin/apache/config
webmin/apache/httpd-info
webmin/at/config
webmin/backup-config/config
webmin/bacula-backup/config
webmin/bind8/config
webmin/cluster-passwd/config
webmin/cluster-useradmin/config
webmin/cluster-webmin/config
webmin/config
webmin/cpan/config
webmin/cron/config
webmin/custom/config
webmin/dhcpd/config
webmin/dovecot/config
webmin/exim/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/idmapd/config
webmin/inetd/config
webmin/init/config
webmin/inittab/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
webmin/nis/config
webmin/openslp/config
webmin/package-updates/config
webmin/pam/config
webmin/pap/config
webmin/passwd/config
webmin/postfix/config
webmin/postgresql/config
webmin/ppp-client/config
webmin/pptp-client/config
webmin/pptp-server/config
webmin/proc/config
webmin/proftpd/config
webmin/qmailadmin/config
webmin/quota/config
webmin/reload
webmin/restart
webmin/restart-by-force-kill [new file with mode: 0755]
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/start
webmin/status/config
webmin/stop
webmin/syslog-ng/config
webmin/syslog/config
webmin/system-status/config
webmin/tcpwrappers/config
webmin/telnet/config
webmin/time/config
webmin/uninstall.sh
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 42f38aa20a79547c3b96ff6870e1de0039ba01fe..f37e69e225fce95529fed159461ce408e0f68a9c 100755 (executable)
@@ -1548,7 +1548,6 @@ maybe chmod 0755 'init.d/sysstat'
 maybe chmod 0755 'init.d/udev'
 maybe chmod 0755 'init.d/ufw'
 maybe chmod 0755 'init.d/uuidd'
-maybe chmod 0755 'init.d/webmin'
 maybe chmod 0755 'init.d/x11-common'
 maybe chmod 0644 'init/mysql.conf'
 maybe chmod 0755 'initramfs-tools'
@@ -1624,6 +1623,7 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
+maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
@@ -10849,6 +10849,11 @@ maybe chmod 0755 'w3m'
 maybe chmod 0644 'w3m/config'
 maybe chmod 0644 'w3m/mailcap'
 maybe chmod 0755 'webmin'
+maybe chmod 0755 'webmin/.reload-init'
+maybe chmod 0755 'webmin/.restart-by-force-kill-init'
+maybe chmod 0755 'webmin/.restart-init'
+maybe chmod 0755 'webmin/.start-init'
+maybe chmod 0755 'webmin/.stop-init'
 maybe chgrp 'bin' 'webmin/acl'
 maybe chmod 0711 'webmin/acl'
 maybe chgrp 'bin' 'webmin/acl/config'
@@ -11208,6 +11213,7 @@ maybe chgrp 'bin' 'webmin/raid/config'
 maybe chmod 0600 'webmin/raid/config'
 maybe chmod 0755 'webmin/reload'
 maybe chmod 0755 'webmin/restart'
+maybe chmod 0755 'webmin/restart-by-force-kill'
 maybe chgrp 'bin' 'webmin/samba'
 maybe chmod 0711 'webmin/samba'
 maybe chgrp 'bin' 'webmin/samba/config'
diff --git a/init.d/webmin b/init.d/webmin
deleted file mode 100755 (executable)
index cdb6469..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-# chkconfig: 235 99 10
-# description: web-based administration interface for Unix systems
-#
-### BEGIN INIT INFO
-# Provides:          webmin
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:     $local_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: web-based administration interface for Unix systems
-# Description:       Webmin is a web-based interface for system administration
-#                    for Unix. Using Webmin you can configure DNS, Samba, NFS,
-#                    local/remote filesystems and more using your web browser.
-### END INIT INFO
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="web-based administration interface for Unix systems"
-NAME=Webmin
-PIDFILE=/var/webmin/miniserv.pid
-SCRIPTNAME=/etc/init.d/$NAME
-START=/etc/webmin/start
-STOP=/etc/webmin/stop
-RELOAD=/etc/webmin/reload
-LOCKFILE=/var/lock/subsys/webmin
-CONFFILE=/etc/webmin/miniserv.conf
-
-case "$1" in
-start)
-       $START >/dev/null 2>&1 </dev/null
-       RETVAL=$?
-       if [ "$RETVAL" = "0" ]; then
-               touch $LOCKFILE >/dev/null 2>&1
-       fi
-       ;;
-stop)
-       $STOP
-       RETVAL=$?
-       if [ "$RETVAL" = "0" ]; then
-               rm -f $LOCKFILE
-               pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'`
-               if [ "$pidfile" = "" ]; then
-                       pidfile=$PIDFILE
-               fi
-               rm -f $pidfile
-       fi
-       ;;
-status)
-       pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'`
-       if [ "$pidfile" = "" ]; then
-               pidfile=$PIDFILE
-       fi
-       if [ -s $pidfile ]; then
-               pid=`cat $pidfile`
-               kill -0 $pid >/dev/null 2>&1
-               if [ "$?" = "0" ]; then
-                       echo "$NAME (pid $pid) is running"
-                       RETVAL=0
-               else
-                       echo "$NAME is stopped"
-                       RETVAL=1
-               fi
-       else
-               echo "$NAME is stopped"
-               RETVAL=1
-       fi
-       ;;
-restart)
-       $STOP ; $START
-       RETVAL=$?
-       ;;
-reload|force-reload)
-       $RELOAD
-       RETVAL=$?
-       ;;
-*)
-       echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" >&2
-       RETVAL=1
-       ;;
-esac
-exit $RETVAL
-
diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/systemd/system/multi-user.target.wants/webmin.service b/systemd/system/multi-user.target.wants/webmin.service
new file mode 120000 (symlink)
index 0000000..06d82b5
--- /dev/null
@@ -0,0 +1 @@
+/lib/systemd/system/webmin.service
\ No newline at end of file
diff --git a/webmin/.reload-init b/webmin/.reload-init
new file mode 100755 (executable)
index 0000000..70b36fd
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo Reloading Webmin server in /usr/share/webmin
+pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
+kill -USR1 `cat $pidfile`
diff --git a/webmin/.restart-by-force-kill-init b/webmin/.restart-by-force-kill-init
new file mode 100755 (executable)
index 0000000..0364d5d
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+/etc/webmin/.stop-init --kill
+/etc/webmin/.start-init
diff --git a/webmin/.restart-init b/webmin/.restart-init
new file mode 100755 (executable)
index 0000000..737bb84
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+/etc/webmin/.stop-init
+/etc/webmin/.start-init
diff --git a/webmin/.start-init b/webmin/.start-init
new file mode 100755 (executable)
index 0000000..e401b59
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh
+echo Starting Webmin server in /usr/share/webmin
+trap '' 1
+LANG=
+export LANG
+unset PERLIO
+export PERLIO
+PERLLIB=/usr/share/webmin
+export PERLLIB
+exec '/usr/share/webmin/miniserv.pl' $* /etc/webmin/miniserv.conf
diff --git a/webmin/.stop-init b/webmin/.stop-init
new file mode 100755 (executable)
index 0000000..8dc90f5
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/sh
+if [ "$1" = "--kill" ]; then
+  echo Force stopping Webmin server in /usr/share/webmin
+else
+  echo Stopping Webmin server in /usr/share/webmin
+fi
+pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
+pid=`cat $pidfile` 2>/dev/null
+if [ "$pid" != "" ]; then
+  kill $pid || exit 1
+  touch /var/webmin/stop-flag
+  if [ "$1" = "--kill" ]; then
+    sleep 1
+    ((ps axf | grep "webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) || kill -9 -- -$pid || kill -9 $pid) 2>/dev/null
+  fi
+  exit 0
+else
+  if [ "$1" = "--kill" ]; then
+    (ps axf | grep "webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) 2>/dev/null
+  fi
+fi
index c572bfa888ad416eae4d27ca8cbf732f4305a4d6..ee9b4c16bf9c98fa7f50a8d5cc598fcc568ad3c9 100644 (file)
@@ -1,3 +1,3 @@
+display=1
 ssleay=/usr/bin/openssl
 order=0
-display=1
index bb60ddd39c009e10b3e51c2ead98194ab89da228..b3cb22c08ac8d2e7734fcaa7243ccab74eac3f82 100644 (file)
@@ -1,7 +1,7 @@
-stop_cmd=adsl-stop
 pap_file=/etc/ppp/pap-secrets
-status_cmd=adsl-status
-pppoe_conf=/etc/ppp/pppoe.conf
 start_cmd=adsl-start
+stop_cmd=adsl-stop
 pppoe_cmd=pppoe
+pppoe_conf=/etc/ppp/pppoe.conf
 conf_style=0
+status_cmd=adsl-status
index a31edabcbfd145ec85ac796ce4d4f2cb4e4d4f56..003ebb11cc5559dda5bdbac81019f2718ead6c95 100644 (file)
@@ -1,2 +1,2 @@
-autologin=0
 timeout=120
+autologin=0
index 46b9bc7776cf810e229b35ddbfac266352ca276b..2c9fb00c4a6a7b69a8c193634c99f9f9b1d170ff 100644 (file)
@@ -1,25 +1,25 @@
-auto_mods=1
-max_servers=100
+httpd_path=/usr/sbin/apache2
+test_apachectl=1
+srm_conf=/etc/apache2/srm.conf
+start_cmd=/etc/init.d/apache2 start
+test_config=1
+apply_cmd=/usr/sbin/apache2ctl graceful
+httpd_dir=/etc/apache2
 test_manual=0
-mime_types=/etc/apache2/mime.types
+link_dir=/etc/apache2/sites-enabled
 apachectl_path=/usr/sbin/apache2ctl
-show_names=0
-access_conf=/etc/apache2/access.conf
-httpd_conf=/etc/apache2/apache2.conf
-test_config=1
-start_cmd=/etc/init.d/apache2 start
+defines_name=APACHE_ARGUMENTS
+allow_virtualmin=0
+show_order=0
 defines_file=/etc/apache2/envvars
-link_dir=/etc/apache2/sites-enabled
-httpd_path=/usr/sbin/apache2
 stop_cmd=/etc/init.d/apache2 stop
-httpd_dir=/etc/apache2
+show_names=0
+auto_mods=1
 test_always=0
-apply_cmd=/usr/sbin/apache2ctl graceful
-allow_virtualmin=0
-srm_conf=/etc/apache2/srm.conf
 virt_file=/etc/apache2/sites-available
-format_config=1
-defines_name=APACHE_ARGUMENTS
 show_list=0
-test_apachectl=1
-show_order=0
+format_config=1
+max_servers=100
+httpd_conf=/etc/apache2/apache2.conf
+access_conf=/etc/apache2/access.conf
+mime_types=/etc/apache2/mime.types
index 7c635574ca02f7cdcb62e02b4827689ef2921cfe..f048f9875f57a874c408cc2cc4599616e0b425ff 100644 (file)
@@ -1,4 +1,4 @@
-time=1647270094
+time=1651146608
 cmd=/usr/sbin/apache2
 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
 version=2.453
index abf2f64550e838bab95c127aa47d04bee39ead7d..6f83c111cd181982c44ebd26b0e4a71872f48304 100644 (file)
@@ -1,2 +1,2 @@
-at_dir=/var/spool/cron/atjobs
 at_style=linux
+at_dir=/var/spool/cron/atjobs
index 5d1c57e87eb30530e70bf4acd955b5b1a089763b..c6694b38208c25d91c5fdc7b2fccdd13cc229065 100644 (file)
@@ -1,3 +1,3 @@
-date_subs=0
 webmin_subs=0
+date_subs=0
 apply=1
index ba603046b566e546cc5995a24bcbc3e5c0e6012b..d7b3e601c7c4b016637e56019762a27186622145 100644 (file)
@@ -1,12 +1,12 @@
-pass=
+bextract=bextract
+bls=bls
+user=bacula
 db=bacula
-wait=1
-driver=Pg
 apply=1
+pass=
+bacula_dir=/etc/bacula
+wait=1
 showdirs=0
-bextract=bextract
 btape=btape
 init_start=0
-user=bacula
-bls=bls
-bacula_dir=/etc/bacula
+driver=Pg
index ba7b684eaf0be19dee2e2a22630459febf75b655..9c9d03759239f4bc57cae2469ab084e45859e8a6 100644 (file)
@@ -1,46 +1,46 @@
+allow_underscore=1
+ipv6_mode=1
 soa_start=0
-no_pid_chroot=0
-rndcconf_cmd=rndc-confgen
-rev_def=0
-reversezonefilename_format=ZONE.rev
+forwardzonefilename_format=ZONE.hosts
+spf_record=0
 max_zones=50
-master_ttl=1
-other_slaves=1
 largezones=0
-named_path=/usr/sbin/named
-by_view=0
-support_aaaa=1
+checkconf=named-checkconf
 slave_dir=/var/lib/bind
-signzone=dnssec-signzone
-updserial_on=1
-rndc_conf=/etc/bind/rndc.conf
+other_slaves=1
 show_list=0
-forwardzonefilename_format=ZONE.hosts
-no_chroot=0
+no_pid_chroot=0
+confirm_zone=1
+soa_style=0
+rndc_cmd=rndc
+updserial_man=1
+force_random=0
+updserial_on=1
 allow_comments=0
-records_order=0
+reversezonefilename_format=ZONE.rev
+zones_file=/etc/bind/named.conf.local
+rndcconf_cmd=rndc-confgen
+master_ttl=1
 whois_cmd=whois
+support_aaaa=1
+allow_wild=1
 updserial_def=0
-named_conf=/etc/bind/named.conf
-ipv6_mode=1
-checkzone=named-checkzone
-soa_style=0
-updserial_man=1
+no_chroot=0
+confirm_rec=0
 dnssec_info=1
-keygen=dnssec-keygen
+relative_paths=0
+short_names=0
+rev_def=0
+named_path=/usr/sbin/named
 pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
-checkconf=named-checkconf
-confirm_rec=0
-allow_wild=1
-allow_underscore=1
-force_random=0
+records_order=0
+rndc_conf=/etc/bind/rndc.conf
 allow_long=0
-spf_record=0
-rev_must=0
-short_names=0
-rndc_cmd=rndc
+by_view=0
+checkzone=named-checkzone
+named_conf=/etc/bind/named.conf
 master_dir=/var/lib/bind
+rev_must=0
 ndc_cmd=ndc
-zones_file=/etc/bind/named.conf.local
-relative_paths=0
-confirm_zone=1
+keygen=dnssec-keygen
+signzone=dnssec-signzone
index 2ab4c6af195ddf54df41fc1e48bf2e62574345c1..294c79b71b8dc36a5aaae5e2a8f67717f4f7144f 100644 (file)
@@ -1,3 +1,3 @@
-input_type=0
-sort_mode=0
 max_users=200
+sort_mode=0
+input_type=0
index 721680af95d3e8b2e0a93a15f291e2a11f0ac688..66823a62bce5eecb715d5ac312fc75d136a5dde4 100644 (file)
@@ -1,9 +1,9 @@
-conf_find_user=1
+conf_host_links=1
+conf_allow_sync=1
 table_mode=0
-sort_mode=0
 conf_add_user=1
-conf_add_group=1
-conf_allow_sync=1
 conf_allow_refresh=1
 conf_find_group=1
-conf_host_links=1
+conf_add_group=1
+conf_find_user=1
+sort_mode=0
index 470eaee86535d874ac8fe55dbfee746a3dd61ef8..fd788cb1e074549f6b0858f1e816c867c16118a7 100644 (file)
@@ -1,2 +1,2 @@
-sort_mode=0
 table_mode=0
+sort_mode=0
index 69df8debb707c1612d3cd0648b02f50a10dd9303..32980bccc136831e4f36645dcd024bb64fa66422 100644 (file)
@@ -1,32 +1,32 @@
-md5pass=1
-dateformat=dd/mon/yyyy
-showlogin=0
-hostnamemode=0
-passwd_uindex=0
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-referers_none=1
-help_width=
-product=webmin
+sysinfo=0
+feedback_to=
 help_height=
-lang=en.UTF-8
+product=webmin
 passwd_file=/etc/shadow
-os_version=9.0
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+passwd_uindex=0
 passwd_pindex=1
-feedback_to=
-tempdelete_days=7
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
 log=1
-webprefix=
-showhost=0
-real_os_type=Ubuntu Linux
-passwd_mindex=4
-theme=authentic-theme
-real_os_version=18.04.1
+hostnamemode=0
+os_version=9.0
+help_width=
+nofeedbackcc=0
 lang_root=de.UTF-8
+theme=authentic-theme
+tempdelete_days=7
+passwd_cindex=2
 hostnamedisplay=
+md5pass=1
+passwd_mindex=4
+showhost=0
 ld_env=LD_LIBRARY_PATH
-passwd_cindex=2
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-os_type=debian-linux
-nofeedbackcc=0
-sysinfo=0
+webprefix=
+real_os_type=Ubuntu Linux
+dateformat=dd/mon/yyyy
+showlogin=0
 by_view=0
+lang=en.UTF-8
+real_os_version=18.04.1
+os_type=debian-linux
+referers_none=1
index 988ef28b58fa1db1528956c89cbaee657a472b90..1709700626ac900ce9adfff874818bdfba423928 100644 (file)
@@ -1,6 +1,6 @@
+incyum=1
+refresh_days=30
+incpackages=1
 packages=http://www.cpan.org/modules/02packages.details.txt.gz
 cpan=http://www.cpan.org/authors/id
-incyum=1
 save_partial=0
-incpackages=1
-refresh_days=30
index 0cd2bc204962a32ac67ef095ec6eb28bcfd51e12..fd8420f9ac6f9779ff64437034fad84d18531400 100644 (file)
@@ -1,26 +1,26 @@
-hourly_only=0
-cron_user_delete_command=crontab -r
-max_jobs=100
-cron_delete_command=crontab -u USER -r
+cron_input=1
+run_parts=run-parts
+cron_deny_all=2
 kill_subs=0
-match_user=1
+cron_delete_command=crontab -u USER -r
 cron_edit_command=crontab -u USER -e
-system_crontab=/etc/crontab
+cron_user_edit_command=crontab -e
+vixie_cron=1
+show_next=0
+cron_dir=/var/spool/cron/crontabs
+show_run=0
+cron_user_delete_command=crontab -r
 cron_allow_file=/var/spool/cron/allow
-cron_deny_all=2
-cronfiles_dir=/etc/cron.d
+show_comment=0
 cron_deny_file=/var/spool/cron/deny
-init_name=cron
+show_time=0
+cronfiles_dir=/etc/cron.d
+match_user=1
 match_mode=0
-cron_dir=/var/spool/cron/crontabs
-cron_user_get_command=crontab -l
-show_next=0
-show_run=0
-run_parts=run-parts
 cron_get_command=crontab -u USER -l
-vixie_cron=1
-cron_input=1
-show_time=0
-show_comment=0
+max_jobs=100
+cron_user_get_command=crontab -l
+system_crontab=/etc/crontab
+hourly_only=0
+init_name=cron
 max_len=80
-cron_user_edit_command=crontab -e
index 6c90eac06c733e23a340f701f76f832422f09785..e04c3678d0af0234c45aabcb08ab7800014b2bf1 100644 (file)
@@ -1,4 +1,4 @@
-params_cmd=0
 params_file=0
 display_mode=0
+params_cmd=0
 columns=2
index d04d02cc7dc4b50b0bdcef3ed7ae2ba492b15031..d6d8ec942401de73bf36bbec5e9794674f281e83 100644 (file)
@@ -1,17 +1,17 @@
-lease_file=/var/lib/dhcp/dhcpd.leases
-lease_tz=0
-group_name=0
-restart_cmd=service isc-dhcp-server restart
+display_max=100
+show_mac=0
 lease_vendor=0
-stop_cmd=service isc-dhcp-server stop
 interfaces_type=debian
-show_ip=0
-dhcpd_conf=/etc/dhcp/dhcpd.conf
-show_mac=0
-display_max=100
-dhcpd_path=/usr/sbin/dhcpd
+lease_tz=0
 lease_sort=0
-dhcpd_nocols=5
-desc_name=0
+lease_file=/var/lib/dhcp/dhcpd.leases
+group_name=0
 start_cmd=service isc-dhcp-server start
+dhcpd_path=/usr/sbin/dhcpd
 pid_file=/var/run/dhcpd.pid
+restart_cmd=service isc-dhcp-server restart
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+desc_name=0
+show_ip=0
+stop_cmd=service isc-dhcp-server stop
+dhcpd_nocols=5
index c9ec1754c6f6cc00f031b9a234ccac2ca575a320..6d7e530585a410e1ff8c7433e7b86c7bf70da8fe 100644 (file)
@@ -1,4 +1,4 @@
 dovecot_config=/etc/dovecot/dovecot.conf
-init_script=dovecot
-pid_file=/var/run/dovecot/master.pid
 dovecot=/usr/sbin/dovecot
+pid_file=/var/run/dovecot/master.pid
+init_script=dovecot
index be8e38671e12ea0728a339557b5b56dd5ca84e6b..41602ebc7f85aa9cd0aa33a43ef0cebc29af0aec 100644 (file)
@@ -1,8 +1,8 @@
-exim_dir=/etc/exim4
+exim_dbmfile=/etc/exim4/local_domains
 exim_mail_file=Maildir
-exim_addrfile=/etc/exim4/email-addresses
 mail_system=1
 exim_aliasfileext=
-exim_virt_dir=/etc/exim4/aliases
-exim_dbmfile=/etc/exim4/local_domains
+exim_addrfile=/etc/exim4/email-addresses
 exim_dbmext=.dbm
+exim_virt_dir=/etc/exim4/aliases
+exim_dir=/etc/exim4
index d058f98247d9e11b2c6589b053c55a767da9bb92..cae702a7a43f9df69198c1c26a95002fcefe60b4 100644 (file)
@@ -1,4 +1,4 @@
-server_cmd=/usr/bin/fail2ban-server
-config_dir=/etc/fail2ban
 init_script=fail2ban
+config_dir=/etc/fail2ban
+server_cmd=/usr/bin/fail2ban-server
 client_cmd=/usr/bin/fail2ban-client
index ea72bf561b7902e099f6d81b3734b9a7191f2c0e..c5e814f90ead52d32a8233cc78bc2b7f465c539d 100644 (file)
@@ -1,6 +1,6 @@
-daemon_user=root
-max_users=400
-config_file=
-fetchmail_path=fetchmail
 view_mode=0
+config_file=
 pid_file=/var/run/fetchmail.pid
+fetchmail_path=fetchmail
+max_users=400
+daemon_user=root
index 458717139629b85bf43c5ca8d70ed52fefc2af17..946cd37ecee9aa5c438ac0878f44c6491c5b6ba8 100644 (file)
@@ -1,6 +1,6 @@
 alias_files=/etc/aliases       /etc/postfix/aliases    /etc/mail/aliases
-warn_procmail=1
-virtualmin_config=/etc/webmin/virtual-server
 reply_force=0
+virtualmin_config=/etc/webmin/virtual-server
 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 forward_procmail=0
+warn_procmail=1
index b7d38d52e5e0f83fc66625a2cd0d89cf466e0833..0dadcf4d40d8e169f89914e34ca302b16ec07b19 100644 (file)
@@ -1,6 +1,6 @@
-view_condition=1
 cluster_mode=1
 direct=0
 comment_mod=0
-view_comment=0
 force_init=0
+view_condition=1
+view_comment=0
index 27a37b449070057fbd2ec4e93da8bdc6cf89f25b..e2b36c045551504bb8245638414709d1104d5937 100644 (file)
@@ -1,6 +1,6 @@
+force_init=0
+comment_mod=0
+view_comment=0
 view_condition=1
 direct=0
 cluster_mode=1
-view_comment=0
-force_init=0
-comment_mod=0
index 0293f7bb5f523d6ae381b7ef4bc515b4ef2a6bed..9b29de11d413c17f27e15f5196fbb5835e8f8180 100644 (file)
@@ -1,7 +1,7 @@
 nonewtape=0
-date_subs=0
-error_email=0
 webmin_subs=0
 simple_sched=0
-always_tar=0
 run_mode=0
+always_tar=0
+error_email=0
+date_subs=0
index 98bdc19a6c726f1111e96d76f1391092758b207e..49d2d2860a488476038de234b6553446fb888d14 100644 (file)
@@ -1,3 +1,3 @@
-grub_path=grub
 menu_file=/boot/grub/menu.lst
+grub_path=grub
 install=(hd0)
index ea4034815c3973a10dac484b06f1f004af510b8c..8ed7416715f8e9f9c2820a777d8ee388225c9519 100644 (file)
@@ -1,15 +1,15 @@
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+serials=/dev/ttyS*
+haresources=
+ha_dir=/etc/ha.d
+req_resource_cmd=/usr/lib/heartbeat/req_resource
 stop_cmd=/etc/init.d/heartbeat stop
 heartbeat=/usr/lib/heartbeat/heartbeat
-haresources=
-apply_cmd=/etc/init.d/heartbeat reload
+ha_cf=
 alt_haresources=/usr/share/doc/packages/heartbeat/haresources
 resource_d=
+start_cmd=/etc/init.d/heartbeat start
+authkeys=
 alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
-req_resource_cmd=/usr/lib/heartbeat/req_resource
-ha_cf=
 pid_file=/var/run/heartbeat.pid
-authkeys=
-start_cmd=/etc/init.d/heartbeat start
-serials=/dev/ttyS*
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
-ha_dir=/etc/ha.d
+apply_cmd=/etc/init.d/heartbeat reload
index e9216a18826a38abe478b8efbe882d2c0e4dcecb..ac6b6f22ea33c34987c2f0ea2d24a15939f77664 100644 (file)
@@ -1,7 +1,7 @@
+sha1=0
+htaccess=.htaccess
 htgroups=.htgroups
 extra_directives=
-htaccess=.htaccess
-sha1=0
 md5=1
 htpasswd=.htpasswd
 digest=1
index 12c48476cda5b23e9db34767cd3816e3ddfb4c1e..d6cd4227f403ad79c0c428ea91b948d7e0148e2d 100644 (file)
@@ -1,3 +1,3 @@
+idmapd_conf=/etc/idmapd.conf
 restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
 idmapd_path=/usr/sbin/rpc.idmapd
-idmapd_conf=/etc/idmapd.conf
index 5c0ffe022c32a19a3ceac36291fcb9a0133f1358..b1a8392f94349fcd62c320b6016e7925590b5793 100644 (file)
@@ -1,16 +1,16 @@
-qm_mode=0
-sort_mode=0
-restart_command=killall -HUP inetd
-protocols_file=/etc/protocols
-deny_file=/etc/hosts.deny
-rpc_inetd=1
-extended_inetd=1
 ipv6=0
-tcpd_path=/usr/sbin/tcpd
 rpc_file=/etc/rpc
+restart_command=killall -HUP inetd
+deny_file=/etc/hosts.deny
+show_empty=1
 services_file=/etc/services
-inetd_conf_file=/etc/inetd.conf
 allow_file=/etc/hosts.allow
+qm_mode=0
 display_max=100
+protocols_file=/etc/protocols
+sort_mode=0
+rpc_inetd=1
+tcpd_path=/usr/sbin/tcpd
+extended_inetd=1
+inetd_conf_file=/etc/inetd.conf
 rpc_protocols=tcp udp
-show_empty=1
index f2dab9192dde4856a02704c03d702832196a13f0..5cdd69395ae66c9c7d52a10799d742bffa3182a2 100644 (file)
@@ -1,17 +1,17 @@
 reboot_command=reboot
+no_chkconfig=0
+soft_links=1
+inittab_id=id
+init_base=/etc/
+init_dir=/etc/init.d
+show_opts=0
+expert=0
+init_info=1
 desc=1
+status_check=0
 order_digits=2
-boot_levels=2 3 5
-init_info=1
-init_dir=/etc/init.d
-inittab_id=id
-soft_links=1
 shutdown_command=poweroff
 sort_mode=0
-init_base=/etc/
+boot_levels=2 3 5
 atboot_product=webmin
-status_check=0
 order=0
-no_chkconfig=0
-expert=0
-show_opts=0
index 31db3e7b12dd3f7b98454b47d9f60a32ecb9275c..c2b25728b1fcde239638523ffc5b34f97bc5b66e 100644 (file)
@@ -1,2 +1,2 @@
-inittab_file=/etc/inittab
 telinit=telinit
+inittab_file=/etc/inittab
index 11066b9a5b91e7240a3eb28dfb42d867c57252f9..d0aa8c90f51b7531d6d4e2ff9489cce67563c2ea 100644 (file)
@@ -1,9 +1,9 @@
 ipf=ipf
 view_condition=1
+view_comment=0
+ipnat_conf=/etc/ipf/ipnat.conf
+cluster_mode=0
 ipf_conf=/etc/ipf/ipf.conf
+ipnat=ipnat
 ipfstat=ipfstat
 cluster_nat=1
-cluster_mode=0
-ipnat_conf=/etc/ipf/ipnat.conf
-ipnat=ipnat
-view_comment=0
index 9a86268c9eb54d21dae4cb936a0e0752a246a481..1fe9c223fe5ff6fe6b729a396c2375f9cdb04172 100644 (file)
@@ -1,6 +1,6 @@
+view_comment=0
+cluster_mode=0
+view_condition=1
 view_counters=0
 version=2
-view_comment=0
 ipfw=/sbin/ipfw
-view_condition=1
-cluster_mode=0
index cbeaf660277340f6cca884a312bdd9f46b879cbc..0b4223b3165b58c9381fe0315ac23539296fe869 100644 (file)
@@ -1,8 +1,8 @@
 file=/etc/ipsec.conf
-policies_dir=/etc/ipsec.d/policies
+restart_cmd=/etc/init.d/ipsec restart
 ipsec=/usr/sbin/ipsec
-start_cmd=/etc/init.d/ipsec start
 logfile=/var/log/messages
-secrets=/etc/ipsec.secrets
 stop_cmd=/etc/init.d/ipsec stop
-restart_cmd=/etc/init.d/ipsec restart
+policies_dir=/etc/ipsec.d/policies
+start_cmd=/etc/init.d/ipsec start
+secrets=/etc/ipsec.secrets
index 5a5abf81ed035565f78d900f58e5ee9f62cf71b3..ff8eac0eb1fd85b321dac2e550a2fd777d91d5a0 100644 (file)
@@ -1,6 +1,6 @@
-init_name=open-iscsi
 config_file=/etc/iscsi/iscsid.conf
 iscsiadm=iscsiadm
 iscsiiname=iscsi-iname
-initiator_file=/etc/iscsi/initiatorname.iscsi
 ifaces_dir=/var/lib/iscsi/ifaces
+initiator_file=/etc/iscsi/initiatorname.iscsi
+init_name=open-iscsi
index 6d78d09aaaeb6baa33bbe398379406c8c78c275d..84ae0cb6a1e6b8f3d701a2fcc6d60af796a64abf 100644 (file)
@@ -1,6 +1,6 @@
-targets_file=/etc/iscsi/targets
-iscsi_server=/usr/sbin/iscsi-target
 auths_file=/etc/iscsi/auths
-opts_file=/etc/sysconfig/netbsd-iscsi
+iscsi_server=/usr/sbin/iscsi-target
 pid_file=/var/run/iscsi-target.pid
+targets_file=/etc/iscsi/targets
+opts_file=/etc/sysconfig/netbsd-iscsi
 init_name=netbsd-iscsi
index 4b46ef9ef14276026dcced3f28bd49b6206e7717..7c517d529ad5f7ec0d79a431cb29d7e47e8cb811 100644 (file)
@@ -1,7 +1,7 @@
-opts_file=/etc/default/iscsitarget
-init_name=iscsitarget
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
-targets_file=/etc/iet/targets.allow
+config_file=/etc/iet/ietd.conf
 initiators_file=/etc/iet/initiators.allow
 ietadm=ietadm
-config_file=/etc/iet/ietd.conf
+targets_file=/etc/iet/targets.allow
+pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
+init_name=iscsitarget
+opts_file=/etc/default/iscsitarget
index 853c8fac2f7a7247c5063af233c13a1c74d11019..6010bceef00b3d5db6d1e1181b46592bebef35ea 100644 (file)
@@ -1,5 +1,5 @@
 tgtadmin=tgt-admin
-tgtadm=tgtadm
-tgtd=tgtd
 init_name=tgtd
+tgtd=tgtd
 config_file=/etc/tgt/targets.conf
+tgtadm=tgtadm
index 58993f9379beba4e4bfc6bea6e2bc7943ae19371..2d3456223209bfedafc80afa80b80514bfd32ade 100644 (file)
@@ -1,5 +1,5 @@
-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
-jabber_config=/etc/jabber/jabber.xml
+start_cmd=/etc/init.d/jabberd start
+jabber_dir=/var/lib/jabber
index 4460f14f739d912bea17ddceee4289c0cfec75f6..41ce77d5e72d965ef7e4286010241d2d75b4c117 100644 (file)
@@ -1,3 +1,3 @@
-auth_ldap=/etc/ldap.conf
-secret=/etc/ldap.secret
 init_name=nslcd
+secret=/etc/ldap.secret
+auth_ldap=/etc/ldap.conf
index 5074b616cd4fe5eb91bb25e5ddcc79edc95190c7..180728c4c2bf6df9630958d2dbef1db8fcd0b14d 100644 (file)
@@ -1,10 +1,10 @@
-schema_dir=/etc/ldap/schema
-start_cmd=/etc/init.d/slapd start
 init_name=slapd
-attr_count=6
-config_file=/etc/ldap/slapd.d
-apply_cmd=/etc/init.d/slapd restart
-ldap_user=openldap
+start_cmd=/etc/init.d/slapd start
 stop_cmd=/etc/init.d/slapd stop
 browse_max=100
 slapd=slapd
+schema_dir=/etc/ldap/schema
+apply_cmd=/etc/init.d/slapd restart
+attr_count=6
+ldap_user=openldap
+config_file=/etc/ldap/slapd.d
index 1859f5bac055fc51095fd42980f2c7cdb14aad06..3301f5b63c261b32040e790d241261935ac80916 100644 (file)
@@ -1,24 +1,24 @@
+other_class=inetOrgPerson
+imap_foldersep=.
+md5=0
+quota_support=0
+membox=0
+given_order=0
+imap_def=0
 ldap_tls=0
-person=1
+alias_same=0
 samba_class=sambaSamAccount
-gecos=1
-membox=0
+samba_gclass=sambaGroup
 auth_ldap=/etc/ldap.conf
+mailfmt=0
+slappasswd=slappasswd
 given=0
+imap_login=cyrus
+gecos=1
 shells=fixed,ldap,passwd,shells
-imap_foldersep=.
 imap_folders=old       public  sent-mail
-given_order=0
+secmode=0
 multi_fields=0
-md5=0
-imap_login=cyrus
-slappasswd=slappasswd
-imap_class=SuSEeMailObject
-mailfmt=0
-samba_gclass=sambaGroup
 samba_def=0
-imap_def=0
-other_class=inetOrgPerson
-alias_same=0
-quota_support=0
-secmode=0
+imap_class=SuSEeMailObject
+person=1
index 901f855de1fcd99658480e1b8f8bccf290172c51..b85fb9a25815cdd0f26d6fbb5ec3c52e5964f05c 100644 (file)
@@ -1,4 +1,4 @@
-logrotate=logrotate
 add_file=/etc/logrotate.d
-sort_mode=0
 logrotate_conf=/etc/logrotate.conf
+logrotate=logrotate
+sort_mode=0
index b279fd33a6757f32c7ceb93b25b7a3fa64278293..612c41c48ca8d242416697b279a4171b1e058872 100644 (file)
@@ -1,17 +1,17 @@
+gs_path=gs
 sort_mode=0
-show_status=0
 display_mode=0
-gs_lib=
-iface_arg=
+model_path=/usr/share/foomatic/db /usr/share/ppd
+iface_perms=755
 start_cmd=/etc/init.d/cupsys start
-show_jobs=0
+smbclient_path=smbclient
+gs_lib=
 driver_style=cups
-spool_dir=/var/spool/cups
-model_path=/usr/share/foomatic/db /usr/share/ppd
-stop_cmd=/etc/init.d/cupsys stop
 iface_owner=lp:lp
-iface_perms=755
-gs_fontpath=
+show_jobs=0
+show_status=0
+stop_cmd=/etc/init.d/cupsys stop
+iface_arg=
+spool_dir=/var/spool/cups
 print_style=cups
-smbclient_path=smbclient
-gs_path=gs
+gs_fontpath=
index c414194c33d28c9273c7c63472e82333a27503c1..68785822ecb4713bcf6db567bfdb1efd7f82e8af 100644 (file)
@@ -1,52 +1,52 @@
-date_fmt=dmy
-view_html=0
-auto=1
-spam_del=0
-vpopmail_dir=/home/vpopmail
-maildir_deleted=0
+no_orig_ip=0
+link_mode=0
+from_virtualmin=1
+sync_delete=1
+track_read=0
+sync_perms=0700
+column_count=4
+arrows=1
+ignore_users_enabled=0
 mail_usermin=mail
-delete_warn=y
+sync_modify=1
+fwd_mode=0
+perpage=20
+wrap_width=80
 no_crlf=0
+html_edit=0
 ignore_users=
+show_unread=0
+no_mailer=0
 mail_system=3
-arrows=1
-sync_modify=1
+view_html=0
+sync_create=0
+date_fmt=dmy
+size_mode=1
 html_quote=0
 noindex_hostname=0
-show_body=0
-show_sent=0
-sync_perms=0700
-ignore_users_enabled=0
+vpopmail_dir=/home/vpopmail
 max_records=200
-mail_dir=Maildir
-log_read=0
-no_mailer=0
-spam_report=
-mailbox_user=.usermin/mailbox
-wrap_width=80
-column_count=4
-mail_file=Mailbox
-sig_file=*
-show_count=0
-sort_mode=1
-no_orig_ip=0
-from_virtualmin=1
-top_buttons=2
-sync_create=0
-html_edit=0
-show_size=1
+maildir_deleted=0
+show_body=0
 show_to=0
-link_mode=0
-show_size_below=0
+mail_dir=Maildir
 open_mode=0
-spam_buttons=mail
-show_unread=0
-fwd_mode=0
+spam_del=0
 check_mod=1
-sync_delete=1
-mail_style=0
 show_delall=0
-perpage=20
-track_read=0
+log_read=0
 show_mail=0
-size_mode=1
+spam_buttons=mail
+delete_warn=y
+show_size_below=0
+show_sent=0
+mail_style=0
+mail_file=Mailbox
+sig_file=*
+show_size=1
+mailbox_user=.usermin/mailbox
+top_buttons=2
+sort_mode=1
+show_count=0
+auto=1
+spam_report=
index 2f6dd539ef535c422ce2cd74b06e9cfdda3d5c54..6bf4ed50ff3616d5b93bdddc80242ebacb67658f 100644 (file)
@@ -1,9 +1,9 @@
 man_cmd_sect=man SECTION PAGE
+search_cmd=man -k PAGE
 list_cmd_sect=man -w SECTION PAGE
-doc_dir=/usr/share/doc
 man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
-search_cmd=man -k PAGE
-man_cmd=man PAGE
-kernel_dir=/usr/src/linux/Documentation
 man2html_path=man2html
+kernel_dir=/usr/src/linux/Documentation
 list_cmd=man -w PAGE
+man_cmd=man PAGE
+doc_dir=/usr/share/doc
index 41ba5646c482267eb480c4f5ae39f5b81745eeaf..ddda3347cb74a3e9cf9c7eb45d8e9abd5e2b977a 100644 (file)
@@ -47,4 +47,4 @@ error_handler_404=404.cgi
 error_handler_401=401.cgi
 root=/usr/share/webmin
 mimetypes=/usr/share/webmin/mime.types
-server=MiniServ/1.991
+server=MiniServ/1.994
index a44d82fdc681cfa29c1eb7c7564d3fb5501492dc..e80ad00b2b5a4e357dcb22742e5f04984786d4c8 100644 (file)
@@ -1,7 +1,7 @@
-start_cmd=/etc/init.d/mon start
-pid_file=/var/run/mon.pid
 cfbasedir=/etc/mon
-mon_cgi=/var/www/cgi-bin/mon.cgi
 restart_cmd=/etc/init.d/mon restart
-stop_cmd=/etc/init.d/mon stop
+pid_file=/var/run/mon.pid
 monshow=/usr/bin/monshow
+mon_cgi=/var/www/cgi-bin/mon.cgi
+start_cmd=/etc/init.d/mon start
+stop_cmd=/etc/init.d/mon stop
index efcc7a3ce519d6805fb5afec5a3b6366f19631c8..73eceb0676017158b78ff1cd49e4f45b52d2c0e8 100644 (file)
@@ -1,10 +1,10 @@
-sysinfo=1
+show_used=1
 nmblookup_path=nmblookup
+sysinfo=1
+smbclient_path=smbclient
 auto_file=/etc/am-utils/amd.conf
-sort_mode=2
-autofs_file=/etc/auto.master
+fstab_file=/etc/fstab
 long_fstypes=1
-smbclient_path=smbclient
-show_used=1
+autofs_file=/etc/auto.master
+sort_mode=2
 nfs_check=1
-fstab_file=/etc/fstab
index 4b80c4c4dc3167d42e4612f7013fbba1f7e208ac..1d3fb19caff26660933f53457bed74ddefa6f6a4 100644 (file)
@@ -1,23 +1,23 @@
-mysql_libs=/usr/local/mysql/lib
+webmin_subs=0
+mysql_data=/var/lib/mysql
+perpage=25
+mysql=/usr/bin/mysql
+access=*: *
 max_text=1000
+nopwd=0
 blob_mode=0
+nodbi=0
+date_subs=0
+mysqladmin=/usr/bin/mysqladmin
 mysqlshow=/usr/bin/mysqlshow
+stop_cmd=service mysql stop
 add_mode=1
+mysql_libs=/usr/local/mysql/lib
 max_dbs=50
 login=root
-access=*: *
-mysql_data=/var/lib/mysql
-perpage=25
-nodbi=0
-nopwd=0
-my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
-stop_cmd=service mysql stop
 start_cmd=service mysql start
+passwd_mode=0
 style=0
-mysqladmin=/usr/bin/mysqladmin
 mysqlimport=/usr/bin/mysqlimport
-webmin_subs=0
-mysql=/usr/bin/mysql
 mysqldump=/usr/bin/mysqldump
-date_subs=0
-passwd_mode=0
+my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
index 4e69dc549ddfd907b6a13a056f652ee89d1437f4..ac7194a35b37e9a2360eb914f586dfe5acf53668 100644 (file)
@@ -1 +1 @@
-8.0.28-0ubuntu0
+8.0.29-0ubuntu0
index efe9f2a6643d7738163aee8b630bd3defb84a0c5..a1e29aa7b4b9515b36cc5b833debbee0ddb6abf4 100644 (file)
@@ -1,5 +1,5 @@
 client_conf=/etc/yp.conf
+max_size=100
 securenets=/etc/ypserv.securenets
 manual_build=0
 nsswitch_conf=/etc/nsswitch.conf
-max_size=100
index 3a8c287aca8368cb3fc65315a7b5a7d4b7a3af1f..a7a4992c5015c49185de8566f0d10289bf06990b 100644 (file)
@@ -1,5 +1,5 @@
-slpd=/usr/sbin/slpd
-slpd_conf=/etc/slp.conf
-slpd_log=/var/log/slpd.log
 slpd_reg=/etc/slp.reg
 slpd_pid=/var/run/slpd.pid
+slpd_conf=/etc/slp.conf
+slpd_log=/var/log/slpd.log
+slpd=/usr/sbin/slpd
index 226c127d1632e46e5caeb7b0b55aff051b351642..195d872e7272f7216056aa344a080b36cb709aad 100644 (file)
@@ -1,2 +1,2 @@
-cache_time=6
 update_multiple=1
+cache_time=6
index 6952676222f5a294ee33edce91554be5c14a7256..b3d9581d6f080167aeba276478138d141113da5d 100644 (file)
@@ -1,4 +1,4 @@
 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
 lib_dirs=/lib/security /lib/*/security
 ignore=README
-pam_dir=/etc/pam.d
index f5aacd02f508f0fcf490b76c9b65ed53f5831f92..f73db29d92b59343032838492c3be9ac38bf59ff 100644 (file)
@@ -1,8 +1,8 @@
-dialin_config=/etc/mgetty+sendfax/dialin.config
 mgetty=mgetty
 serials=/dev/ttyS[0-9]*
 ppp_options=/etc/ppp/options
-pap_file=/etc/ppp/pap-secrets
+dialin_config=/etc/mgetty+sendfax/dialin.config
 encrypt_pass=0
 pppd=pppd
 login_config=/etc/mgetty+sendfax/login.config
+pap_file=/etc/ppp/pap-secrets
index 04110de954ef8ed5a644b4a718c43ee8f546e2c0..75e5ffcde479b9f9dbe56587d0430f9479c96f35 100644 (file)
@@ -1,3 +1,3 @@
-max_users=200
 input_type=0
+max_users=200
 sort_mode=0
index 17770693625e257832efa3b075bcb9cc498b83fc..1e3e1664163fb7983ccae584b4d74430ec6514f9 100644 (file)
@@ -1,29 +1,29 @@
-top_buttons=1
 postfix_aliases_table_command=/usr/sbin/postalias
-sort_mode=0
-postfix_control_command=/usr/sbin/postfix
+postcat_cmd=/usr/sbin/postcat
+postfix_lookup_table_command=/usr/sbin/postmap
 mailq_cmd=postqueue -p
+max_records=200
 show_cmts=0
-columns=2
-delete_confirm=1
-prefix_cmts=0
-delete_warn=1
+index_check=1
 postfix_queue_command=postqueue
-mailq_dir=/var/spool/postfix
-postcat_cmd=/usr/sbin/postcat
-mailq_sort=0
-ldap_doms=0
-postfix_newaliases_command=/usr/bin/newaliases
 postfix_master=/etc/postfix/master.cf
+delete_confirm=1
+mailq_dir=/var/spool/postfix
 check_config=1
-max_records=200
-mailq_count=0
-postfix_lookup_table_command=/usr/sbin/postmap
+delete_warn=1
+perpage=20
 fwd_mode=0
-max_maps=100
-index_check=1
-postfix_config_command=/usr/sbin/postconf
+mailq_count=0
+prefix_cmts=0
 postfix_config_file=/etc/postfix/main.cf
-perpage=20
+postfix_control_command=/usr/sbin/postfix
+columns=2
+max_maps=100
 wrap_width=80
+postfix_config_command=/usr/sbin/postconf
+mailq_sort=0
+postfix_newaliases_command=/usr/bin/newaliases
+sort_mode=0
 postfix_super_command=/usr/sbin/postsuper
+ldap_doms=0
+top_buttons=1
index 45b09b205b9fc55fa84ec92201dcd02a7387bee8..ebfb545270cc9e456d3b85b07b01a9f0af40f9fd 100644 (file)
@@ -1,24 +1,24 @@
-plib=
-pass=
-webmin_subs=0
-date_subs=0
 hba_conf=/etc/postgresql/*/main/pg_hba.conf
 rstr_cmd=/usr/bin/pg_restore
-access_own=0
 style=0
-pid_file=/var/run/postmaster.pid
 start_cmd=/etc/init.d/postgresql* start
+login=postgres
 sameunix=1
-perpage=25
-simple_sched=0
-access=*: *
+psql=/usr/bin/psql
+max_dbs=50
+plib=
 dump_cmd=/usr/bin/pg_dump
-login=postgres
+pass=
 add_mode=1
-max_dbs=50
 stop_cmd=/etc/init.d/postgresql* stop
-nodbi=0
+access_own=0
 basedb=template1
+date_subs=0
 blob_mode=0
-psql=/usr/bin/psql
+nodbi=0
+pid_file=/var/run/postmaster.pid
+simple_sched=0
 max_text=1000
+access=*: *
+perpage=25
+webmin_subs=0
index e0a3e10a857590a0f59e8fa47f3071c334a71acf..7af13e89f9edf9602b79131003a1f6997c3f20bf 100644 (file)
@@ -1,3 +1,3 @@
 file=/etc/wvdial.conf
-wvdialconf=wvdialconf
 wvdial=wvdial
+wvdialconf=wvdialconf
index 6d651873c41b3d077d439242e6b4f0d44bbf2701..0378665329e3048f3206d4eda3775096bdb6c66b 100644 (file)
@@ -1,5 +1,5 @@
-pptp_options=/etc/ppp/options.pptp
-pptp=pptp
 peers_dir=/etc/ppp/peers
+pptp_options=/etc/ppp/options.pptp
 timeout=30
+pptp=pptp
 pap_file=/etc/ppp/chap-secrets
index eb47ed31eafd11940ddf33505353195c08a9a6e9..6dfe23ff79b60c7c058fdaca757bd7bfdbc0da64 100644 (file)
@@ -1,9 +1,9 @@
-pap_file=/etc/ppp/chap-secrets
-stop_cmd=/etc/init.d/pptpd stop
 ppp_options=/etc/ppp/options
-pid_file=/var/run/pptpd.pid
 log_file=/var/log/messages
+pptp_ppp_options=/etc/ppp/pptpd-options
 pptpd=pptpd
+stop_cmd=/etc/init.d/pptpd stop
 start_cmd=/etc/init.d/pptpd start
-pptp_ppp_options=/etc/ppp/pptpd-options
+pap_file=/etc/ppp/chap-secrets
+pid_file=/var/run/pptpd.pid
 file=/etc/pptpd.conf
index 463d069318baea1a57a021e0e6a1f8ff00e1453c..dec53dd48788dcb6c2ebf0fb75d0a6e8a8bec76b 100644 (file)
@@ -1,6 +1,6 @@
-ps_style=linux
-base_ppid=1
 hide_self=1
 cut_length=80
+ps_style=linux
 default_mode=last
 trace_java=0
+base_ppid=1
index b010bddf2b63609f3a4d79f58f76e78c18a9d96a..a89f043a0faf14a218e1665ad6c284c47b28d075 100644 (file)
@@ -1,9 +1,9 @@
-test_config=1
+test_manual=0
+proftpd_path=/usr/sbin/proftpd
+proftpd_conf=/etc/proftpd/proftpd.conf
+test_always=0
 pid_file=/var/run/proftpd.pid
 ftpusers=/etc/ftpusers
-start_cmd=/etc/init.d/proftpd start
-proftpd_conf=/etc/proftpd/proftpd.conf
-test_manual=0
 stop_cmd=/etc/init.d/proftpd stop
-test_always=0
-proftpd_path=/usr/sbin/proftpd
+test_config=1
+start_cmd=/etc/init.d/proftpd start
index 504511434c8b156795960aee628c651e18bac5dd..13e39d5c8b81cd4d7320dadd4a350d50a3370719 100644 (file)
@@ -1,14 +1,14 @@
-mailq_count=0
+mail_system=1
+mail_dir_qmail=Maildir
+index_min=1000000
+sort_mode=0
 mail_dir=
+mailq_sort=0
+columns=2
 max_records=200
-sort_mode=0
+mailq_count=0
 fwd_mode=0
-perpage=20
-index_min=1000000
 qmail_dir=/var/qmail
-mail_system=1
-columns=2
 mail_file=Mailbox
-mailq_sort=0
+perpage=20
 delete_warn=1
-mail_dir_qmail=Maildir
index c29262cb235371d22aeca6aaccfc156a1d9f7259..d7352efa2e54b16ba5e2f62ceac50d570f2963d1 100644 (file)
@@ -1,25 +1,25 @@
-user_edquota_command=edquota -u
+group_quotaon_command=quotaon -g
+user_repquota_command=repquota -u -v
+group_copy_command=edquota -g -p
+user_quotaoff_command=quotaoff -u
+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}.
+sort_mode=0
+display_max=100
+quotacheck_command=quotacheck -u -g
+group_quotaoff_command=quotaoff -g
 user_grace_command=edquota -u -t
+pc_show=1
+group_setquota_command=setquota -g
 block_mode=1
-quotacheck_command=quotacheck -u -g
-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_setquota_command=setquota -u
 user_quota_command=quota -v -u
+user_edquota_command=edquota -u
+group_edquota_command=edquota -g
+user_quotaon_command=quotaon -u
+group_grace_command=edquota -g -t
+user_setquota_command=setquota -u
 user_copy_command=edquota -u -p
-group_copy_command=edquota -g -p
+block_size=1024
 show_grace=1
 group_repquota_command=repquota -g -v
-group_grace_command=edquota -g -t
-group_quotaoff_command=quotaoff -g
-user_quotaon_command=quotaon -u
-user_repquota_command=repquota -u -v
-group_quotaon_command=quotaon -g
-block_size=1024
 hide_uids=0
-group_edquota_command=edquota -g
-sort_mode=0
-user_quotaoff_command=quotaoff -u
-group_setquota_command=setquota -g
-display_max=100
-pc_show=1
 group_quota_command=quota -v -g
index 70b36fdf0a5e8128bef32965004c5e509cdebbac..ed85cb533a295b3e3db49a95192ef3a553c8cd4d 100755 (executable)
@@ -1,4 +1,2 @@
 #!/bin/sh
-echo Reloading Webmin server in /usr/share/webmin
-pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
-kill -USR1 `cat $pidfile`
+/etc/webmin/.reload-init >/dev/null 2>&1
index a425fffbb93ef5363e65f16a820c85873d507c50..f436041c2b2170a76737c9f923b45ca038bf4f19 100755 (executable)
@@ -1,2 +1,2 @@
 #!/bin/sh
-/etc/webmin/stop --kill && /etc/webmin/start
+/bin/systemctl restart webmin
diff --git a/webmin/restart-by-force-kill b/webmin/restart-by-force-kill
new file mode 100755 (executable)
index 0000000..4ce26d9
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+/etc/webmin/.stop-init --kill >/dev/null 2>&1
+/bin/systemctl stop webmin
+/bin/systemctl start webmin
index 9672ac8b15e3dc4f92ff3e4df4c78dd3ef92ab61..343b04835ca8371edd82aa63939a1412b2bebf0c 100644 (file)
@@ -1,18 +1,18 @@
-list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-pdbedit=/usr/bin/pdbedit
 sort_mode=0
-dont_convert=-499
-start_cmd=service smbd start ; service nmbd start
-run_from_inetd=0
-samba_server=/usr/sbin/smbd
-swat=/usr/sbin/swat
-stop_cmd=service smbd stop ; service nmbd stop
 net=/usr/bin/net
-name_server=/usr/sbin/nmbd
+smb_passwd=/etc/samba/smbpasswd
 restart_cmd=service smbd restart ; service nmbd restart
-smbgroupedit=/usr/bin/smbgroupedit
-samba_password_program=/usr/bin/smbpasswd
+start_cmd=service smbd start ; service nmbd start
+swat=/usr/sbin/swat
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
 smb_conf=/etc/samba/smb.conf
+samba_password_program=/usr/bin/smbpasswd
 text_lists=0
+samba_server=/usr/sbin/smbd
+stop_cmd=service smbd stop ; service nmbd stop
+run_from_inetd=0
+smbgroupedit=/usr/bin/smbgroupedit
 samba_status_program=/usr/bin/smbstatus
-smb_passwd=/etc/samba/smbpasswd
+dont_convert=-499
+name_server=/usr/sbin/nmbd
+pdbedit=/usr/bin/pdbedit
index b9009faeb7a19131471003a7f802111a7e8cf06e..a8477b7527cf78dc35aef8884a2735a3b4b31697 100644 (file)
@@ -1,4 +1,4 @@
+clear=1
 sarg_conf=/etc/sarg/sarg.conf
-sarg=sarg
 naked=0
-clear=1
+sarg=sarg
index 3e9904b2aef5f304ae3a136d8d34f375bd7ec3b9..6ee6adc3ec7a99abb35ad686db19b79db7081f59 100644 (file)
@@ -1,30 +1,30 @@
-sendmail_cf=/etc/mail/sendmail.cf
+mailq_count=0
+prefix_cmts=0
 perpage=20
-track_read=0
 mail_file=mbox
-wrap_width=80
-mail_style=0
-mailq_show=Date,From,To,Size,Status
-max_records=200
-mailq_count=0
-mail_dir=/var/spool/mail
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-makemap_path=makemap
 fwd_mode=0
-sendmail_features=/usr/share/sendmail/cf
-index_min=1000000
-prefix_cmts=0
-columns=2
-delete_confirm=1
-mailq_sort=0
+mail_style=0
 delete_warn=1
-show_to=0
-sendmail_path=/usr/lib/sendmail
+index_min=1000000
 sort_mode=0
-sendmail_command=/usr/lib/sendmail -bd -q1h
-order_mail=0
-sendmail_mc=/etc/mail/sendmail.mc
+sendmail_features=/usr/share/sendmail/cf
 top_buttons=1
+sendmail_pid=/var/run/sendmail/mta/sendmail.pid
+mailq_sort=0
+wrap_width=80
+mail_type=0
+columns=2
+sendmail_mc=/etc/mail/sendmail.mc
+max_records=200
 show_cmts=0
+mailq_show=Date,From,To,Size,Status
 smrsh_dir=/etc/smrsh
-mail_type=0
+makemap_path=makemap
+order_mail=0
+sendmail_cf=/etc/mail/sendmail.cf
+track_read=0
+show_to=0
+delete_confirm=1
+mail_dir=/var/spool/mail
+sendmail_command=/usr/lib/sendmail -bd -q1h
+sendmail_path=/usr/lib/sendmail
index 700dee00ae808a4328751756c3466670ea56f0c3..f1549a0e154c71c4bb06487cb62a3a8feca98b2f 100644 (file)
@@ -1,11 +1,11 @@
-deffast=2
+scan_time=5
+display_mode=0
+sort_mode=0
+show_status=1
 show_ip=0
 deflink=0
-max_servers=100
-sort_mode=0
+groups_dir=/etc/cluster/groups
+deffast=2
 resolve=1
-show_status=1
-scan_time=5
+max_servers=100
 capath=/usr/share/ca-certificates
-display_mode=0
-groups_dir=/etc/cluster/groups
index 4b3e40b527944dd61bb7418468b7358c2f9330aa..044e158ce7275da152f8c1d257357e6a87fedd07 100644 (file)
@@ -1,3 +1,3 @@
+clear_envs=0
 max_output=100000
 max_runtime=86400
-clear_envs=0
index 58652372aa5235bd8cd2781f7e476ea0afe6fcb2..5fb82ba27e52974fc8fce88d9129f828e1ebe663 100644 (file)
@@ -1,5 +1,5 @@
-display_zone_descriptions=1
-macros=/usr/share/shorewall
-actions=/etc/shorewall/actions /usr/share/shorewall/actions.std
 config_dir=/etc/shorewall
+actions=/etc/shorewall/actions /usr/share/shorewall/actions.std
+display_zone_descriptions=1
 shorewall=shorewall
+macros=/usr/share/shorewall
index ad86c0d807892de2020e2706b412ba1b4d95aef8..91ded64c140c89ff572e142df57002c134e67c32 100644 (file)
@@ -1,5 +1,5 @@
 actions=/etc/shorewall6/actions        /usr/share/shorewall6/actions.std
-macros=/usr/share/shorewall6
+config_dir=/etc/shorewall6
 display_zone_descriptions=1
 shorewall6=shorewall6
-config_dir=/etc/shorewall6
+macros=/usr/share/shorewall6
index e5c58db0a792b2fa10cc21d1f6c484484aabc943..89a62e9fea9507e845a162626724f6db9862abc8 100644 (file)
@@ -1,4 +1,4 @@
 mode=1
+ata=0
 smartctl=smartctl
 attribs=1
-ata=0
index 9476e6757eb6e0138a39c58f065e799939856a63..abefc9ae10ef073282f7793f269ef7d75d3798f0 100644 (file)
@@ -1,3 +1,3 @@
 apt_mode=0
-update_system=apt
 package_system=debian
+update_system=apt
index 0c7fe60683aedf3781398a0b5c63d67f35fd4a7c..db1e375ef461ccb401f32c07e6a89aec925e93bd 100644 (file)
@@ -1,12 +1,12 @@
-warn_procmail=1
-addto=0
-processes=spamd amavisd
-mode=0
 sa_learn=sa-learn
-call_spam=1
-procmailrc=/etc/procmailrc
-restart_cmd=/etc/init.d/spamassassin restart
-spamassassin=spamassassin
+warn_procmail=1
 local_cf=/etc/spamassassin/local.cf
+call_spam=1
 max_awl=200
 procmail_cmd=*
+spamassassin=spamassassin
+mode=0
+addto=0
+processes=spamd amavisd
+restart_cmd=/etc/init.d/spamassassin restart
+procmailrc=/etc/procmailrc
index 6ed5227d1a1d0e8dc863d35358400bcf5918bb37..05c7600706655142e79621645dbdbd56b4969731 100644 (file)
@@ -1,21 +1,21 @@
-pid_file=/var/run/squid.pid
-crypt_conf=0
-log_dir=/var/log/squid
-squid_stop=service squid stop
-sync_create=0
-squidclient=squidclient
-sync_delete=0
-cal_fmt=w
-sort_conf=0
-restart_pos=0
-squid_path=squid
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
 cal_all=1
-cal_max=50000
+squidclient=squidclient
+sync_create=0
 calamaris=calamaris
-squid_start=service squid start
 cal_args=-aw
-squid_conf=/etc/squid/squid.conf
+squid_restart=service squid reload
 cache_dir=/var/spool/squid
+sort_conf=0
+sync_delete=0
+log_dir=/var/log/squid
+squid_stop=service squid stop
+squid_conf=/etc/squid/squid.conf
+pid_file=/var/run/squid.pid
+cal_max=50000
+restart_pos=0
 sync_modify=1
-squid_restart=service squid reload
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+squid_path=squid
+crypt_conf=0
+cal_fmt=w
+squid_start=service squid start
index 71f80075d06b65c4d88e2525e906066c1d5f3cf5..dac2fab6d58530dd595372a72c4764290379e69e 100644 (file)
@@ -1,11 +1,11 @@
-pid_file=/var/run/sshd.pid
 sync_auth=1
-start_cmd=service ssh start
-sync_gnupg=0
-sync_create=0
+stop_cmd=service ssh stop
 sync_pass=0
-sshd_path=/usr/sbin/sshd
+sync_gnupg=0
+sshd_config=/etc/ssh/sshd_config
 client_config=/etc/ssh/ssh_config
 keygen_path=/usr/bin/ssh-keygen
-sshd_config=/etc/ssh/sshd_config
-stop_cmd=service ssh stop
+pid_file=/var/run/sshd.pid
+start_cmd=service ssh start
+sshd_path=/usr/sbin/sshd
+sync_create=0
index 6d757eb9f9ad671d28f47b9b7050a174cff7f582..443754448523d1fe1759876543672c10423c5814 100755 (executable)
@@ -1,11 +1,2 @@
 #!/bin/sh
-echo Starting Webmin server in /usr/share/webmin
-trap '' 1
-LANG=
-export LANG
-#PERLIO=:raw
-unset PERLIO
-export PERLIO
-PERLLIB=/usr/share/webmin
-export PERLLIB
-exec '/usr/share/webmin/miniserv.pl' $* /etc/webmin/miniserv.conf
+/bin/systemctl start webmin
index f24b9da159b275d6aefe0dca442aef599ab66c87..0f02b6638a2867c9fb57144258afa9c948bf5ed9 100644 (file)
@@ -1,14 +1,14 @@
-pager_cmd=sms_client
-columns=2
 snmp_version=2
-history_show=50
-sched_offset=0
+sort_mode=0
+subject_mode=0
+index_status=1
 history_purge=30
+sched_offset=0
 snmp_trap=1.3.6.1.4.1.10000.1.1
-output=0
+columns=2
+pager_cmd=sms_client
+history_show=50
+pinger=linux
 sysinfo_users=0
-index_status=1
+output=0
 sysinfo=0
-subject_mode=0
-sort_mode=0
-pinger=linux
index c0f841769f163359ad3fccc6523168ca9be386cb..d22cf1dff8f54b287128348c6b1dbe2293364411 100755 (executable)
@@ -1,15 +1,2 @@
 #!/bin/sh
-echo Stopping Webmin server in /usr/share/webmin
-pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
-pid=`cat $pidfile`
-if [ "$pid" != "" ]; then
-  kill $pid || exit 1
-  touch /var/webmin/stop-flag
-  if [ "$1" = "--kill" ]; then
-    sleep 2
-    (kill -9 -- -$pid || kill -9 $pid) 2>/dev/null
-  fi
-  exit 0
-else
-  exit 1
-fi
+/bin/systemctl stop webmin
index b65ada8b41b68b74d88c966f55988e3f87c582ea..38744b2e16ff9f0bf4499a28ee0be5340722b296 100644 (file)
@@ -1,7 +1,7 @@
 lines=20
-syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 start_cmd=/etc/init.d/syslog-ng start
-pid_file=/var/run/syslog-ng.pid
-syslogng_cmd=syslog-ng
 compressed=1
+syslogng_cmd=syslog-ng
 stop_cmd=/etc/init.d/syslog-ng stop
+pid_file=/var/run/syslog-ng.pid
+syslogng_conf=/etc/syslog-ng/syslog-ng.conf
index ea1ad6447fd21ae2f83fa0e05687d418a23a6761..6ba4b67a11eb92519548c116e4ca79007a398c61 100644 (file)
@@ -1,19 +1,19 @@
+m4_path=
+pri_all=1
 syslog_conf=/etc/rsyslog.conf
-signal_cmd=/usr/sbin/service rsyslog restart
-syslogd=/usr/sbin/rsyslogd
-pri_dir=1
-tags=0
+socket=0
 m4_conf=0
-others=1
+sync=1
+syslogd=/usr/sbin/rsyslogd
+compressed=1
+lines=20
 reverse=0
+others=1
+tags=0
+signal_cmd=/usr/sbin/service rsyslog restart
 start_cmd=/usr/sbin/service rsyslog start
-pid_file=/var/run/rsyslogd.pid
-pri_all=1
+pri_dir=1
 restart_cmd=/usr/sbin/service rsyslog restart
-socket=0
-compressed=1
-lines=20
-sync=1
-pipe=1
 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-m4_path=
+pid_file=/var/run/rsyslogd.pid
+pipe=1
index b6a7e4155594fba9d042e3e77f367757be828a52..c627a9fec943a9bb9cf121b1f02e78452fb485a9 100644 (file)
@@ -1,2 +1,2 @@
-collect_interval=5
 collect_pkgs=1
+collect_interval=5
index 10eceba4da0333ba478f7088eb7b1c4512a85570..c2cea99fcab6e16c9c726d3fc2cbe3a8bb2c32af 100644 (file)
@@ -1,3 +1,3 @@
+inetd_services=0
 hosts_deny=/etc/hosts.deny
 hosts_allow=/etc/hosts.allow
-inetd_services=0
index 173f347e739ed0f1f073c2f884fc06ff4eb53da6..164ed233c8592eb4a673df31aaadeee470a796be 100644 (file)
@@ -1,5 +1,5 @@
 mode=1
-detach=0
-proxy=0
 sizemode=0
 no_test=0
+proxy=0
+detach=0
index 840cc4d444ff41fa2bfffaa52549c3a1fa758d99..5a4000f563946fa1698a9feadf230779ab87cd72 100644 (file)
@@ -1,6 +1,6 @@
-lease=5
 timeserver_hardware=1
-timeserver=0.pool.ntp.org
 seconds=1
+timeserver=0.pool.ntp.org
 ntp_only=1
+lease=5
 zone_style=linux
index dab59154fafc149dabd64ad23dab67ba50d422dd..bf73c12878060955812e401b9e61b943f264fcbf 100755 (executable)
@@ -4,6 +4,6 @@ read answer
 printf "\n"
 if [ "$answer" = "y" ]; then
        echo "Removing Webmin package .."
-       dpkg --remove webmin
-       echo "Done!"
+       dpkg --remove --force-depends webmin
+       echo ".. done"
 fi
index 1c7534ae334dc2a853fbb7a0cab6a997871a0896..f6605280c415787296dba2359d6101589fcf9b2b 100644 (file)
@@ -1,4 +1,4 @@
-dir=/
 duser=root
 user=root
+dir=/
 ddir=/
index 81de8beb650a62613907d058cc1d7c2cf14b2999..a73aca4c641ab14a82c04ba1aa7da95378ccf1ff 100644 (file)
@@ -1,41 +1,41 @@
-shadow_file=/etc/shadow
-passwd_progmode=0
-gid_calc=0
-uid_calc=0
-email_type=0
+empty_mode=0
 home_base=/home
-delete_root=0
-skip_md5=0
-display_mode=1
-sort_mode=0
-random_password=0
+md5=1
+membox=0
+from_files=0
 last_show=0
-display_max=400
-group_file=/etc/group
-shells=fixed,passwd,shells
-uid_mode=1
+passwd_progmode=0
 gid_mode=1
-base_gid=1000
+selinux_con=user_u:object_r:user_home_dir_t
+homedir_perms=0755
+uid_mode=1
+passwd_same=0
+group_file=/etc/group
+default_group=users
 default_other=1
-passwd_stars=0
+delete_root=0
+passwd_file=/etc/passwd
+base_gid=1000
 gshadow_file=/etc/gshadow
-membox=0
+display_mode=1
 extra_real=0
-home_style=0
+alias_check=0
+sort_mode=0
+gid_calc=0
+shadow_file=/etc/shadow
+random_password=0
+uid_calc=0
+skip_md5=0
+display_max=400
+new_user_group=0
+delete_only=0
 user_files=/etc/skel
-passwd_file=/etc/passwd
+secmode=0
 lock_string=*
-from_files=0
-new_user_group=0
+email_type=0
 new_user_gid=0
-md5=1
-selinux_con=user_u:object_r:user_home_dir_t
-passwd_dict=0
-default_group=users
 base_uid=1000
-passwd_same=0
-delete_only=0
-secmode=0
-homedir_perms=0755
-empty_mode=0
-alias_check=0
+passwd_dict=0
+home_style=0
+passwd_stars=0
+shells=fixed,passwd,shells
index d8cbac19ca98b2a94cef88bdf919af68b00fbe21..420489df74fa7154ade761e87d4eed21d1af0d0c 100644 (file)
@@ -1,7 +1,7 @@
 updays=1
 cron_mode=0
-upshow=1
-usermin_dir=/etc/usermin
 uphour=4
+usermin_dir=/etc/usermin
 upmissing=0
+upshow=1
 update=0
index 09b638fc22a85d17d0e82807191bcc3cb7e982af..704ddb2878f3a87414f115097c1c9419e39c66ef 100644 (file)
@@ -1 +1 @@
-1.991
+1.994
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 dcf70c62cbe98a5aa989e0a1c22a281448e9858b..f0526e5d09aa3ac547a07d8dae9e40c180a6db17 100644 (file)
@@ -1,6 +1,6 @@
-auto=apache,squid,proftpd,wuftpd
-naked=0
-skip_old=0
+alt_conf=/etc/webalizer/webalizer.conf.sample
 webalizer_conf=/etc/webalizer/webalizer.conf
+naked=0
+auto=apache,squid,proftpd,wuftpd
 webalizer=/usr/bin/webalizer
-alt_conf=/etc/webalizer/webalizer.conf.sample
+skip_old=0
index 71fe5cabd0d900b18681f56e9ca4a3ba872241b8..d0f51fd2cb96906a1ad3f66e23c3a395b2148c06 100644 (file)
@@ -1,12 +1,12 @@
+upmins=47
 letsencrypt_dns_wait=10
-updays=1
+cron_mode=0
 last_version_number=1.900
 uphour=23
-update=0
-upmissing=0
-last_version_check=1549050668
-cron_mode=0
-upshow=1
 warn_days=7
-upmins=47
 osdn=1
+updays=1
+upshow=1
+update=0
+last_version_check=1549050668
+upmissing=0
index bc16cbc238b88869028c753ea1f6ea5edc6c2cd5..4ba4f3863549c08522eeb6e9d1035a8c8d3b93e3 100644 (file)
@@ -1,8 +1,8 @@
-ftpd_path=/usr/sbin/wu-ftpd
-ftpusers=/etc/wu-ftpd/ftpusers
-ftpconversions=/etc/wu-ftpd/ftpconversions
-log_file=/var/log/xferlog
 ftpgroups=/etc/wu-ftpd/ftpgroups
-pid_file=/var/run/ftpd.pids-all
+log_file=/var/log/xferlog
+ftpconversions=/etc/wu-ftpd/ftpconversions
 ftpaccess=/etc/wu-ftpd/ftpaccess
 ftphosts=/etc/wu-ftpd/ftphosts
+pid_file=/var/run/ftpd.pids-all
+ftpd_path=/usr/sbin/wu-ftpd
+ftpusers=/etc/wu-ftpd/ftpusers
index 709f2b49ea3cf2dfa836f2b66e19d2015f13c508..9ba1db3626cce42866d2653493546e1d8c5f1e65 100644 (file)
@@ -1,5 +1,5 @@
 pid_file=/var/run/xinetd.pid
-xinetd_conf=/etc/xinetd.conf
 lookup_servs=1
+xinetd_conf=/etc/xinetd.conf
 start_cmd=/etc/init.d/xinetd start
 protocols_file=/etc/protocols