]> git.hoellein.online Git - vserver/commitdiff
committing changes in /etc made by "apt-get upgrade"
authormhoellein <mario@hoellein.online>
Wed, 16 Jun 2021 09:30:26 +0000 (11:30 +0200)
committermhoellein <mario@hoellein.online>
Wed, 16 Jun 2021 09:30:26 +0000 (11:30 +0200)
Package changes:
-imagemagick-6-common 8:6.9.10.23+dfsg-2.1ubuntu11.2 all
+imagemagick-6-common 8:6.9.10.23+dfsg-2.1ubuntu11.4 all
-libmagickcore-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.2 amd64
-libmagickwand-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.2 amd64
+libmagickcore-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.4 amd64
+libmagickwand-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.4 amd64
-python3-ply 3.11-3build1 all
+python3-ply 3.11-3ubuntu0.1 all
-webmin 1.974 all
+webmin 1.979 all

96 files changed:
webmin/acl/config
webmin/adsl-client/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-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/failed.pl
webmin/fetchmail/config
webmin/filter/config
webmin/firewall/config
webmin/firewall6/config
webmin/firewalld/config
webmin/fsdump/config
webmin/grub/config
webmin/heartbeat/config
webmin/htaccess-htpasswd/config
webmin/idmapd/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/login.pl
webmin/logout.pl
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/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/shorewall/config
webmin/shorewall6/config
webmin/smart-status/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/system-status/enable-collection.pl
webmin/telnet/config
webmin/time/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 c572bfa888ad416eae4d27ca8cbf732f4305a4d6..017dd0405cd930e3c80659b9d1d00935c7bcda3d 100644 (file)
@@ -1,3 +1,3 @@
-ssleay=/usr/bin/openssl
 order=0
+ssleay=/usr/bin/openssl
 display=1
index 5e183f2af5a8e9d46eb8432bd714027032e45c3e..fd5b932c3965f676eb1d9606051ade6fec481881 100644 (file)
@@ -1,7 +1,7 @@
-pap_file=/etc/ppp/pap-secrets
-start_cmd=adsl-start
-stop_cmd=adsl-stop
-pppoe_conf=/etc/ppp/pppoe.conf
 pppoe_cmd=pppoe
+stop_cmd=adsl-stop
+start_cmd=adsl-start
 status_cmd=adsl-status
 conf_style=0
+pap_file=/etc/ppp/pap-secrets
+pppoe_conf=/etc/ppp/pppoe.conf
index b64d5913db3b5170ccf16de2d51371f9303b5ce3..87d7b97408fb18752a566b0b4c3726d3e3080fc9 100644 (file)
@@ -1,24 +1,24 @@
-stop_cmd=/etc/init.d/apache2 stop
-defines_name=APACHE_ARGUMENTS
-link_dir=/etc/apache2/sites-enabled
-apachectl_path=/usr/sbin/apache2ctl
-httpd_dir=/etc/apache2
-test_always=0
-defines_file=/etc/apache2/envvars
 test_config=1
+apply_cmd=/usr/sbin/apache2ctl graceful
+test_apachectl=1
+test_manual=0
+virt_file=/etc/apache2/sites-available
+show_list=0
+defines_name=APACHE_ARGUMENTS
 max_servers=100
-srm_conf=/etc/apache2/srm.conf
+mime_types=/etc/apache2/mime.types
 auto_mods=1
-allow_virtualmin=0
-test_apachectl=1
-show_order=0
+defines_file=/etc/apache2/envvars
+httpd_dir=/etc/apache2
+stop_cmd=/etc/init.d/apache2 stop
+link_dir=/etc/apache2/sites-enabled
+start_cmd=/etc/init.d/apache2 start
 access_conf=/etc/apache2/access.conf
-show_list=0
+show_order=0
+httpd_conf=/etc/apache2/apache2.conf
+srm_conf=/etc/apache2/srm.conf
+apachectl_path=/usr/sbin/apache2ctl
 httpd_path=/usr/sbin/apache2
 show_names=0
-httpd_conf=/etc/apache2/apache2.conf
-virt_file=/etc/apache2/sites-available
-start_cmd=/etc/init.d/apache2 start
-test_manual=0
-mime_types=/etc/apache2/mime.types
-apply_cmd=/usr/sbin/apache2ctl graceful
+allow_virtualmin=0
+test_always=0
index f3ba4977583d81f4d250094cf862307a96bf8d31..37e584aae56f36169fd3b92ab4dcc2c84b33dd89 100644 (file)
@@ -1,4 +1,4 @@
-time=1615648121
+time=1623136011
 cmd=/usr/sbin/apache2
 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
-version=2.446
+version=2.448
index 6f83c111cd181982c44ebd26b0e4a71872f48304..abf2f64550e838bab95c127aa47d04bee39ead7d 100644 (file)
@@ -1,2 +1,2 @@
-at_style=linux
 at_dir=/var/spool/cron/atjobs
+at_style=linux
index c6694b38208c25d91c5fdc7b2fccdd13cc229065..c13b50ad6a3f6b5862a7665f45808cc3dc3e19c4 100644 (file)
@@ -1,3 +1,3 @@
 webmin_subs=0
-date_subs=0
 apply=1
+date_subs=0
index 984f7d99bcc0d0c2824a1249678246958def9f25..264c5e47e67be5b0657176f1b2c406c8231fa4c1 100644 (file)
@@ -1,12 +1,12 @@
-user=bacula
 init_start=0
+showdirs=0
+bacula_dir=/etc/bacula
 pass=
-db=bacula
+driver=Pg
+apply=1
+user=bacula
+btape=btape
 wait=1
 bls=bls
+db=bacula
 bextract=bextract
-btape=btape
-driver=Pg
-bacula_dir=/etc/bacula
-showdirs=0
-apply=1
index be8d0ff2c8cac99e9037dbe5e095884c9c6c36b0..57386ecc0f94541159d62d11524cfb1f52cf78c8 100644 (file)
@@ -1,46 +1,46 @@
-ipv6_mode=1
-by_view=0
-checkzone=named-checkzone
-allow_comments=0
-rndc_cmd=rndc
-no_pid_chroot=0
-soa_style=0
-confirm_rec=0
-allow_long=0
-force_random=0
+rev_must=0
+named_conf=/etc/bind/named.conf
 confirm_zone=1
-reversezonefilename_format=ZONE.rev
-dnssec_info=1
-rndcconf_cmd=rndc-confgen
-forwardzonefilename_format=ZONE.hosts
-rev_def=0
-updserial_def=0
-slave_dir=/var/lib/bind
-largezones=0
 other_slaves=1
-no_chroot=0
-records_order=0
-relative_paths=0
+support_aaaa=1
+rndc_cmd=rndc
+named_path=/usr/sbin/named
+ipv6_mode=1
+show_list=0
+rndcconf_cmd=rndc-confgen
 checkconf=named-checkconf
-rndc_conf=/etc/bind/rndc.conf
-rev_must=0
-updserial_man=1
 allow_underscore=1
+whois_cmd=whois
+forwardzonefilename_format=ZONE.hosts
+max_zones=50
+reversezonefilename_format=ZONE.rev
+updserial_man=1
+master_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
-signzone=dnssec-signzone
-allow_wild=1
+no_chroot=0
+confirm_rec=0
 spf_record=0
+updserial_def=0
 zones_file=/etc/bind/named.conf.local
-master_ttl=1
-support_aaaa=1
-max_zones=50
-short_names=0
-master_dir=/var/lib/bind
-named_path=/usr/sbin/named
-ndc_cmd=ndc
 updserial_on=1
-show_list=0
-soa_start=0
+force_random=0
+signzone=dnssec-signzone
+allow_wild=1
+no_pid_chroot=0
+rev_def=0
+checkzone=named-checkzone
+ndc_cmd=ndc
+soa_style=0
+largezones=0
+allow_comments=0
 keygen=dnssec-keygen
-named_conf=/etc/bind/named.conf
-whois_cmd=whois
+short_names=0
+relative_paths=0
+soa_start=0
+master_ttl=1
+rndc_conf=/etc/bind/rndc.conf
+dnssec_info=1
+allow_long=0
+records_order=0
+slave_dir=/var/lib/bind
+by_view=0
index 2ab4c6af195ddf54df41fc1e48bf2e62574345c1..04110de954ef8ed5a644b4a718c43ee8f546e2c0 100644 (file)
@@ -1,3 +1,3 @@
+max_users=200
 input_type=0
 sort_mode=0
-max_users=200
index fd788cb1e074549f6b0858f1e816c867c16118a7..470eaee86535d874ac8fe55dbfee746a3dd61ef8 100644 (file)
@@ -1,2 +1,2 @@
-table_mode=0
 sort_mode=0
+table_mode=0
index 5c5784fc65afafb0014c14daa54916ea9924bd61..67c3e504f37024a8241f198fa17a40ebf863fe51 100644 (file)
@@ -1,9 +1,9 @@
-table_mode=0
-conf_find_user=1
-conf_find_group=1
-conf_allow_refresh=1
-conf_allow_sync=1
-conf_add_user=1
 sort_mode=0
+conf_find_group=1
+conf_find_user=1
 conf_add_group=1
 conf_host_links=1
+conf_add_user=1
+conf_allow_sync=1
+conf_allow_refresh=1
+table_mode=0
index 470eaee86535d874ac8fe55dbfee746a3dd61ef8..fd788cb1e074549f6b0858f1e816c867c16118a7 100644 (file)
@@ -1,2 +1,2 @@
-sort_mode=0
 table_mode=0
+sort_mode=0
index 022504ed451812af2c619a9b48cf2091f8c994a2..9c1c9a30e07b0da81eb9728da050bd606c662b68 100644 (file)
@@ -1,32 +1,32 @@
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
+real_os_version=18.04.1
 os_version=9.0
-lang_root=de.UTF-8
-ld_env=LD_LIBRARY_PATH
-referers_none=1
-feedback_to=
-passwd_cindex=2
-product=webmin
-showlogin=0
 lang=en.UTF-8
+tempdelete_days=7
 real_os_type=Ubuntu Linux
-help_height=
+webprefix=
+help_width=
+feedback_to=
+nofeedbackcc=0
+product=webmin
 md5pass=1
-by_view=0
 path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-nofeedbackcc=0
-webprefix=
 passwd_mindex=4
-real_os_version=18.04.1
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-passwd_file=/etc/shadow
-theme=authentic-theme
-dateformat=dd/mon/yyyy
+showhost=0
+by_view=0
 passwd_uindex=0
-tempdelete_days=7
-log=1
+ld_env=LD_LIBRARY_PATH
 sysinfo=0
-hostnamemode=0
-passwd_pindex=1
-showhost=0
+theme=authentic-theme
+passwd_file=/etc/shadow
 hostnamedisplay=
-help_width=
+lang_root=de.UTF-8
+passwd_cindex=2
+referers_none=1
+showlogin=0
+hostnamemode=0
+help_height=
 os_type=debian-linux
+passwd_pindex=1
+dateformat=dd/mon/yyyy
+log=1
index 201970d3ff65d370bfe93a25b01cb3256bde5594..54f5a54c37b533e79ed7aad6d34b8d6928e6007a 100644 (file)
@@ -1,6 +1,6 @@
 incyum=1
-save_partial=0
 packages=http://www.cpan.org/modules/02packages.details.txt.gz
-refresh_days=30
-incpackages=1
 cpan=http://www.cpan.org/authors/id
+incpackages=1
+save_partial=0
+refresh_days=30
index b0a0004fa0f164d1703cfa86af01f2b2436700ad..3fec1d948b3951e8a8e6a7a752c93f8f2a73cede 100644 (file)
@@ -1,25 +1,25 @@
+cron_delete_command=crontab -u USER -r
+match_mode=0
+run_parts=run-parts
+cron_user_edit_command=crontab -e
+system_crontab=/etc/crontab
+cron_allow_file=/var/spool/cron/allow
+vixie_cron=1
+cron_deny_file=/var/spool/cron/deny
+cronfiles_dir=/etc/cron.d
+max_len=80
+cron_input=1
 match_user=1
 max_jobs=100
+hourly_only=0
 cron_deny_all=2
-cron_deny_file=/var/spool/cron/deny
-cron_input=1
-cron_user_edit_command=crontab -e
 show_time=0
 cron_user_delete_command=crontab -r
-max_len=80
-cronfiles_dir=/etc/cron.d
-hourly_only=0
-cron_delete_command=crontab -u USER -r
-vixie_cron=1
-match_mode=0
-show_comment=0
-cron_edit_command=crontab -u USER -e
+show_next=0
 cron_user_get_command=crontab -l
+show_comment=0
+show_run=0
 cron_dir=/var/spool/cron/crontabs
-system_crontab=/etc/crontab
-cron_allow_file=/var/spool/cron/allow
 cron_get_command=crontab -u USER -l
-show_run=0
+cron_edit_command=crontab -u USER -e
 kill_subs=0
-show_next=0
-run_parts=run-parts
index b0d710c450d60ac4a6b7f7150350d373b6a1960a..55a8becd6fc6cbfc291d2223682679144d49af9a 100644 (file)
@@ -1,4 +1,4 @@
-params_cmd=0
-display_mode=0
 columns=2
 params_file=0
+display_mode=0
+params_cmd=0
index bd51b3012f2a6ca610d405a4e93bbf02b1b92346..54654dad5f09b9742d3aafdccff4a6d70b53be4d 100644 (file)
@@ -1,17 +1,17 @@
-desc_name=0
+show_mac=0
 lease_sort=0
-stop_cmd=service isc-dhcp-server stop
-lease_vendor=0
-group_name=0
-dhcpd_conf=/etc/dhcp/dhcpd.conf
+dhcpd_nocols=5
+desc_name=0
+lease_tz=0
 display_max=100
 restart_cmd=service isc-dhcp-server restart
-pid_file=/var/run/dhcpd.pid
-show_mac=0
-lease_file=/var/lib/dhcp/dhcpd.leases
-dhcpd_nocols=5
 show_ip=0
-start_cmd=service isc-dhcp-server start
+lease_vendor=0
 interfaces_type=debian
-lease_tz=0
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+stop_cmd=service isc-dhcp-server stop
+lease_file=/var/lib/dhcp/dhcpd.leases
+start_cmd=service isc-dhcp-server start
+pid_file=/var/run/dhcpd.pid
 dhcpd_path=/usr/sbin/dhcpd
+group_name=0
index 658fb103e92b0ff8cafcd486c9763a461ad501ff..106ee6dbb3a4d9650fedbb8e97e07c88f6b73dd2 100644 (file)
@@ -1,4 +1,4 @@
-dovecot=/usr/sbin/dovecot
-dovecot_config=/etc/dovecot/dovecot.conf
 init_script=dovecot
+dovecot_config=/etc/dovecot/dovecot.conf
 pid_file=/var/run/dovecot/master.pid
+dovecot=/usr/sbin/dovecot
index 038c2c1e3ff77af66c89001bf2a29686a6c47420..7615024b85e60df7bab465220856ec9d3d713520 100644 (file)
@@ -1,8 +1,8 @@
-exim_mail_file=Maildir
-exim_addrfile=/etc/exim4/email-addresses
-mail_system=1
-exim_dir=/etc/exim4
-exim_dbmext=.dbm
-exim_aliasfileext=
 exim_virt_dir=/etc/exim4/aliases
+exim_dbmext=.dbm
 exim_dbmfile=/etc/exim4/local_domains
+exim_aliasfileext=
+mail_system=1
+exim_dir=/etc/exim4
+exim_mail_file=Maildir
+exim_addrfile=/etc/exim4/email-addresses
index 78081f81ce23e2b857280d7b0f12be5fd500c5c4..8f8b567ee5c1eba3721a712ee9c1a4be0b5428be 100644 (file)
@@ -1,3 +1,3 @@
-apply_cmd=exportfs -r
 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
index aebf23ff0c6261d5da1ed6f0a6de1add62cb7aa8..d058f98247d9e11b2c6589b053c55a767da9bb92 100644 (file)
@@ -1,4 +1,4 @@
-client_cmd=/usr/bin/fail2ban-client
-config_dir=/etc/fail2ban
 server_cmd=/usr/bin/fail2ban-server
+config_dir=/etc/fail2ban
 init_script=fail2ban
+client_cmd=/usr/bin/fail2ban-client
index 60342d489c02149261eb5024ee0008bcde2e0ea9..235639beffebcfc4a4a3c0abd8339559bc085e83 100755 (executable)
@@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf";
 $ENV{'PERLLIB'} = "$root";
 $ENV{'WEBMIN_CONFIG'} = "/etc/webmin";
 $ENV{'WEBMIN_VAR'} = "/var/webmin";
+delete($ENV{'MINISERV_CONFIG'});
 chdir("$root");
 exec("$root/record-failed.pl", @ARGV) || die "Failed to run $root/record-failed.pl : $!";
index 99ab0f6f842a94ad2d33b76f35ad5b436341a745..c20ad8cc146bd04c0e1f4500f81563b26ea96f0f 100644 (file)
@@ -1,6 +1,6 @@
 max_users=400
+daemon_user=root
+view_mode=0
 config_file=
-pid_file=/var/run/fetchmail.pid
 fetchmail_path=fetchmail
-view_mode=0
-daemon_user=root
+pid_file=/var/run/fetchmail.pid
index 935c86bc615206d29b6276dc54aa80558b66a1ed..946703895891ff8b1296583da9ddf985962ea128 100644 (file)
@@ -1,6 +1,6 @@
-forward_procmail=0
-alias_files=/etc/aliases       /etc/postfix/aliases    /etc/mail/aliases
 warn_procmail=1
 virtualmin_config=/etc/webmin/virtual-server
 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
+forward_procmail=0
 reply_force=0
+alias_files=/etc/aliases       /etc/postfix/aliases    /etc/mail/aliases
index 76fed521d50dfd58b6dbbdb5fe4b07e006e7cc1b..c7a2d7d24888ef848a468a74554f7de20ce8db03 100644 (file)
@@ -1,6 +1,6 @@
 comment_mod=0
 view_comment=0
 cluster_mode=1
-view_condition=1
-force_init=0
 direct=0
+force_init=0
+view_condition=1
index 82939db86e43a38c5a960ee8f80c641684eef80c..3f182ff0ab7909eb0c8d259f5915b97e70289d30 100644 (file)
@@ -1,6 +1,6 @@
-force_init=0
-direct=0
-comment_mod=0
 view_comment=0
 cluster_mode=1
+comment_mod=0
+direct=0
+force_init=0
 view_condition=1
index ff329a00df52306ad875de4b3eea0cfebd0b9201..0aae64fac685f941a198c53d4a9b77d5545ebcb9 100644 (file)
@@ -1,2 +1,2 @@
-firewall_cmd=firewall-cmd
 init_name=firewalld
+firewall_cmd=firewall-cmd
index a6930596b5f6bb4b0e2b138d75d6aca509b786fe..6f0f9254cc9833b41637eb5694d434d00fff47fa 100644 (file)
@@ -1,7 +1,7 @@
-webmin_subs=0
-run_mode=0
-always_tar=0
-date_subs=0
-error_email=0
 nonewtape=0
+date_subs=0
+always_tar=0
+run_mode=0
 simple_sched=0
+error_email=0
+webmin_subs=0
index 084704907f752bb59c12dda386c8899c7030bc4e..f6464eb2a6b58252ed6b529e6f893f79d52919bc 100644 (file)
@@ -1,3 +1,3 @@
 install=(hd0)
-menu_file=/boot/grub/menu.lst
 grub_path=grub
+menu_file=/boot/grub/menu.lst
index 958a6ed12926c898dc6993f7d87bddb9a6c4071f..defab373eea83b24b11fd8ab992777f6798b7658 100644 (file)
@@ -1,15 +1,15 @@
-serials=/dev/ttyS*
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
-ha_cf=
-authkeys=
-heartbeat=/usr/lib/heartbeat/heartbeat
-alt_haresources=/usr/share/doc/packages/heartbeat/haresources
 alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
 apply_cmd=/etc/init.d/heartbeat reload
-haresources=
-start_cmd=/etc/init.d/heartbeat start
+authkeys=
+resource_d=
+serials=/dev/ttyS*
 req_resource_cmd=/usr/lib/heartbeat/req_resource
-ha_dir=/etc/ha.d
+heartbeat=/usr/lib/heartbeat/heartbeat
+ha_cf=
 stop_cmd=/etc/init.d/heartbeat stop
-resource_d=
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+haresources=
+alt_haresources=/usr/share/doc/packages/heartbeat/haresources
+ha_dir=/etc/ha.d
 pid_file=/var/run/heartbeat.pid
+start_cmd=/etc/init.d/heartbeat start
index 293b3d362dd8d10f042a70cb901290b9e2b5da74..7907b3f7fcfbc5f1fc41fa7658aabb7c30d3b121 100644 (file)
@@ -1,8 +1,8 @@
-extra_directives=
-sort=0
-htpasswd=.htpasswd
-digest=1
-sha1=0
-md5=1
 htgroups=.htgroups
 htaccess=.htaccess
+digest=1
+md5=1
+sha1=0
+sort=0
+extra_directives=
+htpasswd=.htpasswd
index f25eeba972966eea8656e64271011b1dbc646211..d6cd4227f403ad79c0c428ea91b948d7e0148e2d 100644 (file)
@@ -1,3 +1,3 @@
-restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
 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
index 5dad58cf62c87e4eb0feab0380d1da46b06f49ae..e8d1d75fadd84dc05519b4290e04dad528d8db87 100644 (file)
@@ -1,16 +1,16 @@
-rpc_file=/etc/rpc
-rpc_protocols=tcp udp
-ipv6=0
-rpc_inetd=1
-deny_file=/etc/hosts.deny
-protocols_file=/etc/protocols
-inetd_conf_file=/etc/inetd.conf
-tcpd_path=/usr/sbin/tcpd
 show_empty=1
-sort_mode=0
-qm_mode=0
-restart_command=killall -HUP inetd
+protocols_file=/etc/protocols
+services_file=/etc/services
 allow_file=/etc/hosts.allow
+ipv6=0
+sort_mode=0
 display_max=100
 extended_inetd=1
-services_file=/etc/services
+inetd_conf_file=/etc/inetd.conf
+tcpd_path=/usr/sbin/tcpd
+rpc_inetd=1
+rpc_protocols=tcp udp
+rpc_file=/etc/rpc
+restart_command=killall -HUP inetd
+deny_file=/etc/hosts.deny
+qm_mode=0
index 9bcd5010c4e3dc3bd8ebc6d0e5f679e76345bce3..3c3fc5108f3adccc7e3edb9926ec667d89179029 100644 (file)
@@ -1,17 +1,17 @@
-init_dir=/etc/init.d
-soft_links=1
-no_chkconfig=0
-init_base=/etc/
 init_info=1
-show_opts=0
-reboot_command=reboot
-desc=1
+init_base=/etc/
 order=0
-shutdown_command=poweroff
-expert=0
-order_digits=2
 status_check=0
-atboot_product=webmin
+no_chkconfig=0
+sort_mode=0
 inittab_id=id
+expert=0
+reboot_command=reboot
+show_opts=0
+soft_links=1
+atboot_product=webmin
+order_digits=2
+desc=1
+shutdown_command=poweroff
 boot_levels=2 3 5
-sort_mode=0
+init_dir=/etc/init.d
index fdebcd9469156a1e1b8a5c2e0e1fe55eb62edee9..7cb54a2de34f5c6ded7ce388aaef98ee3bd931fd 100644 (file)
@@ -1,9 +1,9 @@
-cluster_mode=0
 ipf_conf=/etc/ipf/ipf.conf
 ipf=ipf
-ipnat=ipnat
 view_condition=1
 ipnat_conf=/etc/ipf/ipnat.conf
-view_comment=0
-cluster_nat=1
 ipfstat=ipfstat
+ipnat=ipnat
+cluster_nat=1
+view_comment=0
+cluster_mode=0
index e927f16f7cbdd15783d978605b3077e14789e8da..0593c117d1208a262a60bece936d11da0eb725ea 100644 (file)
@@ -1,6 +1,6 @@
-view_comment=0
+view_counters=0
+view_condition=1
 version=2
 ipfw=/sbin/ipfw
-view_condition=1
+view_comment=0
 cluster_mode=0
-view_counters=0
index 191f13a15061f5b1af51f0d793b93cbedfbe90af..6caa0bd682312815adf42b1b477ca8aba61bd290 100644 (file)
@@ -1,8 +1,8 @@
-file=/etc/ipsec.conf
-ipsec=/usr/sbin/ipsec
-logfile=/var/log/messages
-restart_cmd=/etc/init.d/ipsec restart
-start_cmd=/etc/init.d/ipsec start
+stop_cmd=/etc/init.d/ipsec stop
 secrets=/etc/ipsec.secrets
 policies_dir=/etc/ipsec.d/policies
-stop_cmd=/etc/init.d/ipsec stop
+restart_cmd=/etc/init.d/ipsec restart
+ipsec=/usr/sbin/ipsec
+start_cmd=/etc/init.d/ipsec start
+file=/etc/ipsec.conf
+logfile=/var/log/messages
index 9e1711732e0c787f9db464ddee6060e7c6a71d88..ab04a7b87e1bcf42f670520216cd9589c04a2c24 100644 (file)
@@ -1,6 +1,6 @@
-init_name=open-iscsi
-initiator_file=/etc/iscsi/initiatorname.iscsi
+iscsiadm=iscsiadm
 iscsiiname=iscsi-iname
 config_file=/etc/iscsi/iscsid.conf
-iscsiadm=iscsiadm
+initiator_file=/etc/iscsi/initiatorname.iscsi
+init_name=open-iscsi
 ifaces_dir=/var/lib/iscsi/ifaces
index d31eaf93d189b9bb67f0bb759e160b2598df3eab..185ca617828de3bbe0841835bf04c026fbd062eb 100644 (file)
@@ -1,6 +1,6 @@
+init_name=netbsd-iscsi
+targets_file=/etc/iscsi/targets
 opts_file=/etc/sysconfig/netbsd-iscsi
 auths_file=/etc/iscsi/auths
-init_name=netbsd-iscsi
 iscsi_server=/usr/sbin/iscsi-target
 pid_file=/var/run/iscsi-target.pid
-targets_file=/etc/iscsi/targets
index f154008c8ea037aec8576f78d22fd330bc21ab73..5071f24b3c4cc32b07e3286470ebff4ab1290702 100644 (file)
@@ -1,7 +1,7 @@
-targets_file=/etc/iet/targets.allow
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
 init_name=iscsitarget
 initiators_file=/etc/iet/initiators.allow
+targets_file=/etc/iet/targets.allow
 opts_file=/etc/default/iscsitarget
-config_file=/etc/iet/ietd.conf
+pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
 ietadm=ietadm
+config_file=/etc/iet/ietd.conf
index 90828cbbed65fc8e191f7e9561ab9e32bfd6e1d9..2cf30091be0e9233624fe0d57d8d99a7ec526bc9 100644 (file)
@@ -1,5 +1,5 @@
-init_name=tgtd
-tgtadmin=tgt-admin
 tgtadm=tgtadm
 tgtd=tgtd
 config_file=/etc/tgt/targets.conf
+init_name=tgtd
+tgtadmin=tgt-admin
index 415989b80facf78da88f6370780a5277ad1aa9b1..e3714211317a5e2a93d7c3b86edae801d6694e6f 100644 (file)
@@ -1,5 +1,5 @@
-jabber_config=/etc/jabber/jabber.xml
 stop_cmd=/etc/init.d/jabberd stop
-start_cmd=/etc/init.d/jabberd start
+jabber_config=/etc/jabber/jabber.xml
 jabber_daemon=/usr/sbin/jabberd
 jabber_dir=/var/lib/jabber
+start_cmd=/etc/init.d/jabberd start
index 55d1e7111353cdc10d7f72c6550eacdf418fd225..4587ce571ddd2b74f0fa614d0e83175d76b6d069 100644 (file)
@@ -1,3 +1,3 @@
-secret=/etc/ldap.secret
-init_name=nslcd
 auth_ldap=/etc/ldap.conf
+init_name=nslcd
+secret=/etc/ldap.secret
index f47a11828fbd5497b424cce358346b0ed97104cf..33facfa151efbc7598020c0a3f479296e58b6916 100644 (file)
@@ -1,10 +1,10 @@
+slapd=slapd
 init_name=slapd
+apply_cmd=/etc/init.d/slapd restart
 attr_count=6
 stop_cmd=/etc/init.d/slapd stop
-config_file=/etc/ldap/slapd.d
 schema_dir=/etc/ldap/schema
+config_file=/etc/ldap/slapd.d
 browse_max=100
-slapd=slapd
-start_cmd=/etc/init.d/slapd start
 ldap_user=openldap
-apply_cmd=/etc/init.d/slapd restart
+start_cmd=/etc/init.d/slapd start
index e8a4b7437151031a141ac951096d920b46690517..531ddbcfa322498227f679f7e0e3388bb41fc3f3 100644 (file)
@@ -1,24 +1,24 @@
-quota_support=0
+samba_class=sambaSamAccount
 imap_class=SuSEeMailObject
-slappasswd=slappasswd
-gecos=1
-given_order=0
-mailfmt=0
 samba_gclass=sambaGroup
+membox=0
+mailfmt=0
 auth_ldap=/etc/ldap.conf
-alias_same=0
-secmode=0
-imap_folders=old       public  sent-mail
-md5=0
+samba_def=0
+slappasswd=slappasswd
+shells=fixed,ldap,passwd,shells
+imap_foldersep=.
 imap_login=cyrus
+person=1
+md5=0
+quota_support=0
+given_order=0
+imap_folders=old       public  sent-mail
+secmode=0
 given=0
-other_class=inetOrgPerson
-membox=0
+imap_def=0
 ldap_tls=0
+alias_same=0
 multi_fields=0
-samba_class=sambaSamAccount
-samba_def=0
-person=1
-imap_def=0
-shells=fixed,ldap,passwd,shells
-imap_foldersep=.
+other_class=inetOrgPerson
+gecos=1
index 9355bd8da1923bcb29eb5234c3b3720c537a837c..1616cc93672a3a698a2f64afe94858dc78b1f90f 100755 (executable)
@@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf";
 $ENV{'PERLLIB'} = "$root";
 $ENV{'WEBMIN_CONFIG'} = "/etc/webmin";
 $ENV{'WEBMIN_VAR'} = "/var/webmin";
+delete($ENV{'MINISERV_CONFIG'});
 chdir("$root");
 exec("$root/record-login.pl", @ARGV) || die "Failed to run $root/record-login.pl : $!";
index 23aa202468576ea64af4db9a227f899806627a82..7b19aed08c843f62cf5fa43864b635708f4d5072 100755 (executable)
@@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf";
 $ENV{'PERLLIB'} = "$root";
 $ENV{'WEBMIN_CONFIG'} = "/etc/webmin";
 $ENV{'WEBMIN_VAR'} = "/var/webmin";
+delete($ENV{'MINISERV_CONFIG'});
 chdir("$root");
 exec("$root/record-logout.pl", @ARGV) || die "Failed to run $root/record-logout.pl : $!";
index 3cea25e7f4e72feb7f776deb779176026df8269e..7633e98b54d8fa3a116282f079b25afe8fa03b43 100644 (file)
@@ -1,4 +1,4 @@
-logrotate=logrotate
+add_file=/etc/logrotate.d
 logrotate_conf=/etc/logrotate.conf
 sort_mode=0
-add_file=/etc/logrotate.d
+logrotate=logrotate
index e847d4cc7cc2520d76525f5c8ffc1c6087a158fb..b1e0391294a713e11533b60fcaae795168ba6c56 100644 (file)
@@ -1,17 +1,17 @@
-display_mode=0
 print_style=cups
-start_cmd=/etc/init.d/cupsys start
-gs_fontpath=
+sort_mode=0
 spool_dir=/var/spool/cups
-gs_path=gs
-gs_lib=
-driver_style=cups
-iface_perms=755
+display_mode=0
+iface_arg=
 iface_owner=lp:lp
+iface_perms=755
+start_cmd=/etc/init.d/cupsys start
+gs_lib=
+gs_path=gs
+model_path=/usr/share/foomatic/db /usr/share/ppd
+gs_fontpath=
 show_jobs=0
+stop_cmd=/etc/init.d/cupsys stop
+driver_style=cups
 smbclient_path=smbclient
 show_status=0
-sort_mode=0
-iface_arg=
-stop_cmd=/etc/init.d/cupsys stop
-model_path=/usr/share/foomatic/db /usr/share/ppd
index 02d796dde2f309bf56a82d944c5d9bd63054d6fb..9b9ce7858323f33ce84ae332d66c16939d8de9fb 100644 (file)
@@ -1,52 +1,52 @@
-show_to=0
+noindex_hostname=0
+mail_usermin=mail
+html_quote=0
+sync_perms=0700
+sync_modify=1
+wrap_width=80
+show_count=0
+show_unread=0
 ignore_users_enabled=0
-delete_warn=y
-mail_dir=Maildir
-mail_system=3
-fwd_mode=0
-mailbox_user=.usermin/mailbox
-show_sent=0
+sync_create=0
+sync_delete=1
+show_size=1
+log_read=0
+show_to=0
+no_mailer=0
+open_mode=0
 no_crlf=0
-auto=1
+max_records=200
+mail_file=Mailbox
+date_fmt=dmy
+no_orig_ip=0
+mail_style=0
+spam_del=0
+vpopmail_dir=/home/vpopmail
 show_mail=0
-arrows=1
-html_quote=0
-ignore_users=
-open_mode=0
-sync_create=0
+mail_system=3
 link_mode=0
-view_html=0
+track_read=0
+show_body=0
 perpage=20
-sync_delete=1
-size_mode=1
+top_buttons=2
+arrows=1
+from_virtualmin=1
 maildir_deleted=0
 sig_file=*
+html_edit=0
+size_mode=1
+check_mod=1
+column_count=4
 show_size_below=0
-no_orig_ip=0
-show_count=0
-show_unread=0
-max_records=200
-spam_report=
-from_virtualmin=1
-spam_del=0
-track_read=0
-date_fmt=dmy
-top_buttons=2
-sync_perms=0700
-mail_file=Mailbox
-mail_usermin=mail
 show_delall=0
-wrap_width=80
-column_count=4
-log_read=0
-no_mailer=0
+mail_dir=Maildir
 sort_mode=1
-noindex_hostname=0
-show_size=1
-sync_modify=1
-mail_style=0
-vpopmail_dir=/home/vpopmail
-check_mod=1
+show_sent=0
+auto=1
+fwd_mode=0
+spam_report=
+delete_warn=y
+view_html=0
+ignore_users=
 spam_buttons=mail
-html_edit=0
-show_body=0
+mailbox_user=.usermin/mailbox
index b5e281fc0988f29bba6aeb871058a00839acb38f..08a3bbed3f39e1178653d97643075aff09cd409d 100644 (file)
@@ -1,9 +1,9 @@
-doc_dir=/usr/share/doc
-man_cmd=man PAGE
 list_cmd=man -w PAGE
-search_cmd=man -k PAGE
+kernel_dir=/usr/src/linux/Documentation
+man_cmd_sect=man SECTION PAGE
 man2html_path=man2html
 list_cmd_sect=man -w SECTION PAGE
-kernel_dir=/usr/src/linux/Documentation
+search_cmd=man -k PAGE
 man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
-man_cmd_sect=man SECTION PAGE
+man_cmd=man PAGE
+doc_dir=/usr/share/doc
index c0f6a8464b280f64ada3cd8e910bc0601d8ac3b8..eedfddb52bb7cda6dd6670a8461b3283b7399e54 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.974
+server=MiniServ/1.979
index c10046be039e952937c97831095b13797426c5be..fce12211e0e7f5f3c452c2403eb1d60e35a2f80e 100644 (file)
@@ -1,7 +1,7 @@
-start_cmd=/etc/init.d/mon start
+stop_cmd=/etc/init.d/mon stop
 restart_cmd=/etc/init.d/mon restart
-pid_file=/var/run/mon.pid
+start_cmd=/etc/init.d/mon start
 monshow=/usr/bin/monshow
+pid_file=/var/run/mon.pid
 mon_cgi=/var/www/cgi-bin/mon.cgi
 cfbasedir=/etc/mon
-stop_cmd=/etc/init.d/mon stop
index 173f0feb97b7d326798b5a68d92be0ded8c18665..d2c8c36cb590813ef0ebf8b0848e700604daf80f 100644 (file)
@@ -1,10 +1,10 @@
-smbclient_path=smbclient
-show_used=1
-long_fstypes=1
+autofs_file=/etc/auto.master
 fstab_file=/etc/fstab
+auto_file=/etc/am-utils/amd.conf
 nfs_check=1
-autofs_file=/etc/auto.master
-sort_mode=2
+show_used=1
 sysinfo=1
-auto_file=/etc/am-utils/amd.conf
+smbclient_path=smbclient
+long_fstypes=1
+sort_mode=2
 nmblookup_path=nmblookup
index aec34b503eef1d7c699e2500f38fba766ff3c014..aca5132b5f07fab0599f3f4ae4ddc118d35a7148 100644 (file)
@@ -1,23 +1,23 @@
-my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
+nopwd=0
 max_text=1000
-access=*: *
-mysqlshow=/usr/bin/mysqlshow
-login=root
 max_dbs=50
-start_cmd=service mysql start
-add_mode=1
-nopwd=0
-mysqlimport=/usr/bin/mysqlimport
+login=root
+style=0
 mysql=/usr/bin/mysql
-webmin_subs=0
+date_subs=0
+my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
+mysqlshow=/usr/bin/mysqlshow
+mysqlimport=/usr/bin/mysqlimport
+perpage=25
 mysqladmin=/usr/bin/mysqladmin
-nodbi=0
 mysql_data=/var/lib/mysql
-mysql_libs=/usr/local/mysql/lib
 blob_mode=0
+nodbi=0
+mysql_libs=/usr/local/mysql/lib
+add_mode=1
+access=*: *
 stop_cmd=service mysql stop
-passwd_mode=0
 mysqldump=/usr/bin/mysqldump
-perpage=25
-date_subs=0
-style=0
+webmin_subs=0
+passwd_mode=0
+start_cmd=service mysql start
index 7ed0616f82a27abe43017878e582bed6b606171d..d5cc598b7ef523a1eb72a0017507dab79ac583a1 100644 (file)
@@ -1 +1 @@
-8.0.23-0ubuntu0
+8.0.25-0ubuntu0
index cccab7be927fdc635fa7ca4874e67d3e2404b59d..83bb5285e8eb6f7dfa97fea96575ad6c27c0294b 100644 (file)
@@ -1,5 +1,5 @@
+nsswitch_conf=/etc/nsswitch.conf
 manual_build=0
+max_size=100
 securenets=/etc/ypserv.securenets
 client_conf=/etc/yp.conf
-max_size=100
-nsswitch_conf=/etc/nsswitch.conf
index 630b639cf3328bf52649888b95a14b43e136f2cd..af734bea63b7248b20ab119617c8ddc358181676 100644 (file)
@@ -1,5 +1,5 @@
 slpd=/usr/sbin/slpd
-slpd_conf=/etc/slp.conf
-slpd_reg=/etc/slp.reg
 slpd_log=/var/log/slpd.log
+slpd_reg=/etc/slp.reg
 slpd_pid=/var/run/slpd.pid
+slpd_conf=/etc/slp.conf
index 44c9cbe9eff182906dea9d319950bbb511feac1b..67aa68b501a9dac54bf078258fce88445abd6e0b 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
-lib_dirs=/lib/security /lib/*/security
 pam_dir=/etc/pam.d
 ignore=README
+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
+lib_dirs=/lib/security /lib/*/security
index 307d5f41792ed8be137e1ca4e056f99f9b3814c7..cfff8e90e06a4a52d5922c9c64646ec4a114dd21 100644 (file)
@@ -1,8 +1,8 @@
-dialin_config=/etc/mgetty+sendfax/dialin.config
+ppp_options=/etc/ppp/options
 serials=/dev/ttyS[0-9]*
+pppd=pppd
+pap_file=/etc/ppp/pap-secrets
 login_config=/etc/mgetty+sendfax/login.config
+dialin_config=/etc/mgetty+sendfax/dialin.config
 encrypt_pass=0
 mgetty=mgetty
-ppp_options=/etc/ppp/options
-pppd=pppd
-pap_file=/etc/ppp/pap-secrets
index d3250a5b71be517b515fb2dc350bcde44c32eb92..54bbb7cbac1bce6cfff14e8910fb140caccbdc42 100644 (file)
@@ -1,29 +1,29 @@
-postfix_control_command=/usr/sbin/postfix
-postfix_newaliases_command=/usr/bin/newaliases
+postfix_queue_command=postqueue
+fwd_mode=0
+delete_warn=1
+mailq_dir=/var/spool/postfix
 sort_mode=0
+postfix_control_command=/usr/sbin/postfix
+postfix_super_command=/usr/sbin/postsuper
 mailq_count=0
-prefix_cmts=0
-mailq_cmd=postqueue -p
+postfix_config_command=/usr/sbin/postconf
+mailq_sort=0
+max_records=200
+postcat_cmd=/usr/sbin/postcat
+postfix_master=/etc/postfix/master.cf
+perpage=20
+top_buttons=1
 index_check=1
+mailq_cmd=postqueue -p
+prefix_cmts=0
+postfix_newaliases_command=/usr/bin/newaliases
 postfix_config_file=/etc/postfix/main.cf
-postfix_aliases_table_command=/usr/sbin/postalias
+ldap_doms=0
 columns=2
-perpage=20
-mailq_sort=0
-mailq_dir=/var/spool/postfix
+delete_confirm=1
+postfix_aliases_table_command=/usr/sbin/postalias
 postfix_lookup_table_command=/usr/sbin/postmap
-ldap_doms=0
 max_maps=100
-delete_confirm=1
-postfix_master=/etc/postfix/master.cf
-max_records=200
-postfix_queue_command=postqueue
 show_cmts=0
-check_config=1
-postfix_config_command=/usr/sbin/postconf
-delete_warn=1
-top_buttons=1
 wrap_width=80
-postfix_super_command=/usr/sbin/postsuper
-fwd_mode=0
-postcat_cmd=/usr/sbin/postcat
+check_config=1
index faee89f12dd1c0d3f5b9e54b469ed81f82bd25e3..30c7f595fe216207d9f4f45d8f701b3168575eb4 100644 (file)
@@ -1,24 +1,24 @@
-access_own=0
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
-plib=
-add_mode=1
-blob_mode=0
 stop_cmd=/etc/init.d/postgresql* stop
-perpage=25
-date_subs=0
-pid_file=/var/run/postmaster.pid
-style=0
-rstr_cmd=/usr/bin/pg_restore
-webmin_subs=0
-max_text=1000
 sameunix=1
-access=*: *
 pass=
-login=postgres
-max_dbs=50
-nodbi=0
+rstr_cmd=/usr/bin/pg_restore
+start_cmd=/etc/init.d/postgresql* start
+pid_file=/var/run/postmaster.pid
 dump_cmd=/usr/bin/pg_dump
-psql=/usr/bin/psql
-simple_sched=0
 basedb=template1
-start_cmd=/etc/init.d/postgresql* start
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
+date_subs=0
+max_text=1000
+simple_sched=0
+access=*: *
+psql=/usr/bin/psql
+webmin_subs=0
+add_mode=1
+nodbi=0
+access_own=0
+perpage=25
+blob_mode=0
+plib=
+style=0
+max_dbs=50
+login=postgres
index 7af13e89f9edf9602b79131003a1f6997c3f20bf..54849d0a2d50dbd647511d3bc258b5ca08882881 100644 (file)
@@ -1,3 +1,3 @@
-file=/etc/wvdial.conf
-wvdial=wvdial
 wvdialconf=wvdialconf
+wvdial=wvdial
+file=/etc/wvdial.conf
index 43865ec3a89170b34234e482ebc1a436df3458cf..bb3ddbef25e749157118cca22325211400cdf10c 100644 (file)
@@ -1,5 +1,5 @@
+pptp=pptp
 timeout=30
 pptp_options=/etc/ppp/options.pptp
-pap_file=/etc/ppp/chap-secrets
-pptp=pptp
 peers_dir=/etc/ppp/peers
+pap_file=/etc/ppp/chap-secrets
index b597f98ce8c4e30b95909eecb4168a43340230e9..68798ff77ef96a0a2ff605d3f34581af746eb939 100644 (file)
@@ -1,9 +1,9 @@
-pptp_ppp_options=/etc/ppp/pptpd-options
-log_file=/var/log/messages
-ppp_options=/etc/ppp/options
-stop_cmd=/etc/init.d/pptpd stop
+pap_file=/etc/ppp/chap-secrets
 file=/etc/pptpd.conf
 pptpd=pptpd
-pid_file=/var/run/pptpd.pid
+ppp_options=/etc/ppp/options
+stop_cmd=/etc/init.d/pptpd stop
+log_file=/var/log/messages
 start_cmd=/etc/init.d/pptpd start
-pap_file=/etc/ppp/chap-secrets
+pptp_ppp_options=/etc/ppp/pptpd-options
+pid_file=/var/run/pptpd.pid
index a77aef77c9ab67a6745efe43eef8a60f06eb951a..1f0df31bf6a7dea1a55a63bcbf1e100f3d59843e 100644 (file)
@@ -1,6 +1,6 @@
 cut_length=80
-ps_style=linux
-hide_self=1
 base_ppid=1
-default_mode=last
+ps_style=linux
 trace_java=0
+default_mode=last
+hide_self=1
index 9b36ccfbe17b5435b8ead916deb87cf77cc382fe..5dae99ba1c64532f21a24a1d6b9df945fe3c706a 100644 (file)
@@ -1,3 +1,3 @@
 procmail=procmail
-procmailrc=/etc/procmailrc
 includes=0
+procmailrc=/etc/procmailrc
index a3c4d1f3ac8ef37f91f334ead37d4ece989118f5..08670b30433462dc27c7ffaeb31534aa4567e3c2 100644 (file)
@@ -1,9 +1,9 @@
-stop_cmd=/etc/init.d/proftpd stop
 test_config=1
-test_always=0
-proftpd_path=/usr/sbin/proftpd
-test_manual=0
-proftpd_conf=/etc/proftpd/proftpd.conf
 pid_file=/var/run/proftpd.pid
 start_cmd=/etc/init.d/proftpd start
+proftpd_conf=/etc/proftpd/proftpd.conf
+stop_cmd=/etc/init.d/proftpd stop
+proftpd_path=/usr/sbin/proftpd
+test_always=0
 ftpusers=/etc/ftpusers
+test_manual=0
index 0f2b14f596b682bbc30cb84fe93eb4f57879eb8f..cf56e223e7b541fef25db8b52f0276ba49de1c8e 100644 (file)
@@ -1,14 +1,14 @@
-mail_dir_qmail=Maildir
-mailq_count=0
-sort_mode=0
-max_records=200
 mailq_sort=0
-columns=2
-delete_warn=1
-perpage=20
-mail_dir=
+max_records=200
 mail_system=1
+mail_dir=
 index_min=1000000
 qmail_dir=/var/qmail
-mail_file=Mailbox
+columns=2
+mail_dir_qmail=Maildir
+mailq_count=0
+perpage=20
 fwd_mode=0
+delete_warn=1
+mail_file=Mailbox
+sort_mode=0
index 5527b06a5fcf9b0345079360a1885d9205568675..92c0693d72f14ca128ebb914db032ea9df1b3c69 100644 (file)
@@ -1,25 +1,25 @@
-show_grace=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
-block_size=1024
-block_mode=1
-user_setquota_command=setquota -u
+group_edquota_command=edquota -g
+group_quotaoff_command=quotaoff -g
+group_quotaon_command=quotaon -g
+hide_uids=0
 sort_mode=0
-user_quotaon_command=quotaon -u
-display_max=100
-user_edquota_command=edquota -u
-pc_show=1
 user_grace_command=edquota -u -t
-group_quotaon_command=quotaon -g
+display_max=100
+show_grace=1
+group_setquota_command=setquota -g
+user_repquota_command=repquota -u -v
+block_mode=1
+block_size=1024
 quotacheck_command=quotacheck -u -g
-hide_uids=0
-group_edquota_command=edquota -g
-group_copy_command=edquota -g -p
+user_quotaon_command=quotaon -u
+group_grace_command=edquota -g -t
+user_setquota_command=setquota -u
 user_quotaoff_command=quotaoff -u
-user_repquota_command=repquota -u -v
-group_quota_command=quota -v -g
-group_repquota_command=repquota -g -v
-group_quotaoff_command=quotaoff -g
+user_edquota_command=edquota -u
 user_copy_command=edquota -u -p
-group_grace_command=edquota -g -t
-group_setquota_command=setquota -g
+group_repquota_command=repquota -g -v
+group_copy_command=edquota -g -p
+group_quota_command=quota -v -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}.
+pc_show=1
index c4849915b9624a7c9adfff3da495e7ee3187e910..8ffe6d468c9d654b8443b714f9ab5dee68f7ad38 100644 (file)
@@ -1,3 +1,3 @@
-mdstat=/proc/mdstat
 mdadm=/etc/mdadm/mdadm.conf
+mdstat=/proc/mdstat
 raidtab=/etc/raidtab
index 0af908e0a851d01e0322362537ed87267c93031c..450b83ae75833e06692473f5a3fb056cc5c9a753 100644 (file)
@@ -1,18 +1,18 @@
-swat=/usr/sbin/swat
+run_from_inetd=0
+start_cmd=service smbd start ; service nmbd start
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+pdbedit=/usr/bin/pdbedit
 net=/usr/bin/net
-restart_cmd=service smbd restart ; service nmbd restart
-sort_mode=0
 stop_cmd=service smbd stop ; service nmbd stop
+swat=/usr/sbin/swat
+sort_mode=0
+dont_convert=-499
+restart_cmd=service smbd restart ; service nmbd restart
 samba_server=/usr/sbin/smbd
-text_lists=0
-start_cmd=service smbd start ; service nmbd start
 samba_status_program=/usr/bin/smbstatus
-list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-run_from_inetd=0
-smb_passwd=/etc/samba/smbpasswd
-dont_convert=-499
-pdbedit=/usr/bin/pdbedit
 samba_password_program=/usr/bin/smbpasswd
-smb_conf=/etc/samba/smb.conf
 smbgroupedit=/usr/bin/smbgroupedit
+text_lists=0
+smb_conf=/etc/samba/smb.conf
+smb_passwd=/etc/samba/smbpasswd
 name_server=/usr/sbin/nmbd
index c41edca4fc9564eaf3f725f1488e197ad68b6ab7..125c56c891a017c16cd280dd3b1263043c73b169 100644 (file)
@@ -1,4 +1,4 @@
-naked=0
 sarg=sarg
-sarg_conf=/etc/sarg/sarg.conf
 clear=1
+sarg_conf=/etc/sarg/sarg.conf
+naked=0
index e6ae9ba86939bad6cfa6f14f1e26bdbf2b9336cb..6751d332452de2c83ad75fa4588b98b086d65255 100644 (file)
@@ -1,30 +1,30 @@
+sendmail_path=/usr/lib/sendmail
 smrsh_dir=/etc/smrsh
-mailq_show=Date,From,To,Size,Status
-track_read=0
-order_mail=0
-delete_warn=1
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-max_records=200
-show_cmts=0
+mail_dir=/var/spool/mail
 show_to=0
+max_records=200
+mailq_sort=0
+sort_mode=0
 mail_file=mbox
+delete_warn=1
 fwd_mode=0
-wrap_width=80
-mail_type=0
-top_buttons=1
-mail_dir=/var/spool/mail
-sendmail_features=/usr/share/sendmail/cf
-sendmail_cf=/etc/mail/sendmail.cf
+sendmail_command=/usr/lib/sendmail -bd -q1h
+mailq_count=0
+mailq_show=Date,From,To,Size,Status
+makemap_path=makemap
+sendmail_pid=/var/run/sendmail/mta/sendmail.pid
 mail_style=0
+delete_confirm=1
 columns=2
-mailq_sort=0
+index_min=1000000
+wrap_width=80
+order_mail=0
 sendmail_mc=/etc/mail/sendmail.mc
+show_cmts=0
+track_read=0
+top_buttons=1
+sendmail_features=/usr/share/sendmail/cf
 perpage=20
-makemap_path=makemap
-sort_mode=0
+sendmail_cf=/etc/mail/sendmail.cf
+mail_type=0
 prefix_cmts=0
-mailq_count=0
-sendmail_command=/usr/lib/sendmail -bd -q1h
-sendmail_path=/usr/lib/sendmail
-index_min=1000000
-delete_confirm=1
index 211aef8fc6258e067b37cb06e9a5d142d6238ae1..7097c41130aada68286d282c9f8d3b097cb87181 100644 (file)
@@ -1,11 +1,11 @@
-resolve=1
-scan_time=5
 deflink=0
-show_status=1
+scan_time=5
 sort_mode=0
-groups_dir=/etc/cluster/groups
+show_ip=0
+display_mode=0
+resolve=1
 deffast=2
 capath=/usr/share/ca-certificates
-show_ip=0
 max_servers=100
-display_mode=0
+show_status=1
+groups_dir=/etc/cluster/groups
index 9e2d830990c0fe3f0bbd4bdb4ca182d42ae988e5..4a911a946e315dbf9ab174d0c5a6a4b8d6791382 100644 (file)
@@ -1,5 +1,5 @@
-actions=/etc/shorewall/actions /usr/share/shorewall/actions.std
-shorewall=shorewall
-config_dir=/etc/shorewall
 display_zone_descriptions=1
+actions=/etc/shorewall/actions /usr/share/shorewall/actions.std
 macros=/usr/share/shorewall
+config_dir=/etc/shorewall
+shorewall=shorewall
index 915cc8629c3e6e7858f35cde2e085a7e825cd186..3be7e69b7ff678ceffe8a2885b2b419faa47d7eb 100644 (file)
@@ -1,5 +1,5 @@
+shorewall6=shorewall6
 display_zone_descriptions=1
+config_dir=/etc/shorewall6
 macros=/usr/share/shorewall6
-shorewall6=shorewall6
 actions=/etc/shorewall6/actions        /usr/share/shorewall6/actions.std
-config_dir=/etc/shorewall6
index 2f395c4f96ede1c1664374f45426f851bfc56a2e..89a62e9fea9507e845a162626724f6db9862abc8 100644 (file)
@@ -1,4 +1,4 @@
-smartctl=smartctl
 mode=1
-attribs=1
 ata=0
+smartctl=smartctl
+attribs=1
index 348903ba0f256d69ccb2e7a6c73f1270ab002ce4..f9402f2d2847554b36144f505b826c01112aced2 100644 (file)
@@ -1,12 +1,12 @@
-local_cf=/etc/spamassassin/local.cf
-procmail_cmd=*
+sa_learn=sa-learn
 addto=0
+call_spam=1
+restart_cmd=/etc/init.d/spamassassin restart
+procmail_cmd=*
+mode=0
 max_awl=200
-procmailrc=/etc/procmailrc
 spamassassin=spamassassin
-mode=0
-call_spam=1
+local_cf=/etc/spamassassin/local.cf
+procmailrc=/etc/procmailrc
 processes=spamd amavisd
-restart_cmd=/etc/init.d/spamassassin restart
-sa_learn=sa-learn
 warn_procmail=1
index 718160957b39567ab53a46c0c400ee85db4fc307..8813d5f94ce22506a1cfc35c59af81e87f78fd12 100644 (file)
@@ -1,21 +1,21 @@
-sync_modify=1
-pid_file=/var/run/squid.pid
-sync_create=0
-calamaris=calamaris
-squid_path=squid
 cal_fmt=w
-squid_restart=service squid reload
-squidclient=squidclient
-sort_conf=0
-squid_stop=service squid stop
-squid_start=service squid start
 restart_pos=0
-cal_args=-aw
+calamaris=calamaris
+squid_start=service squid start
+cache_dir=/var/spool/squid
 crypt_conf=0
-cal_all=1
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+sync_modify=1
+squid_stop=service squid stop
+sort_conf=0
 log_dir=/var/log/squid
+squid_path=squid
 sync_delete=0
+cal_args=-aw
+cal_all=1
+pid_file=/var/run/squid.pid
+squidclient=squidclient
+squid_restart=service squid reload
 cal_max=50000
-cache_dir=/var/spool/squid
+sync_create=0
 squid_conf=/etc/squid/squid.conf
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
index e2b2c73c1270bf0fe2f2ce5121a5c826bbb5bb8a..1f0f82b42b13c9ba854a7675cb77cd706abcf6f5 100644 (file)
@@ -1,11 +1,11 @@
-sync_gnupg=0
-pid_file=/var/run/sshd.pid
+sshd_path=/usr/sbin/sshd
+sshd_config=/etc/ssh/sshd_config
 sync_create=0
+sync_gnupg=0
 start_cmd=service ssh start
-sshd_config=/etc/ssh/sshd_config
+pid_file=/var/run/sshd.pid
 client_config=/etc/ssh/ssh_config
-sshd_path=/usr/sbin/sshd
 sync_pass=0
-sync_auth=1
-keygen_path=/usr/bin/ssh-keygen
 stop_cmd=service ssh stop
+keygen_path=/usr/bin/ssh-keygen
+sync_auth=1
index a0e8c0dbd406282327b6aa3c8b1cb4e64267de73..54961cdd7647a2d4603c528f8f512e7af4153144 100644 (file)
@@ -1,13 +1,13 @@
+snmp_trap=1.3.6.1.4.1.10000.1.1
+snmp_version=2
+output=0
+sort_mode=0
+subject_mode=0
 index_status=1
+history_purge=30
 pager_cmd=sms_client
 sched_offset=0
+history_show=50
 sysinfo_users=0
-snmp_trap=1.3.6.1.4.1.10000.1.1
-sort_mode=0
-subject_mode=0
 sysinfo=0
-history_show=50
-snmp_version=2
-output=0
-history_purge=30
 columns=2
index cf17b180ee7cb8aa1a4de2548608d5c1cc4d2240..462458d50d3ecff0f4d15a2909d2649dcf843834 100644 (file)
@@ -1,7 +1,7 @@
-syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 compressed=1
 syslogng_cmd=syslog-ng
-stop_cmd=/etc/init.d/syslog-ng stop
+start_cmd=/etc/init.d/syslog-ng start
 pid_file=/var/run/syslog-ng.pid
+syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 lines=20
-start_cmd=/etc/init.d/syslog-ng start
+stop_cmd=/etc/init.d/syslog-ng stop
index 122c6761fad9cf0fd8f79a7e6daaadcd06c8f256..23e7d5100f142ffdf52bbc7b9d20fa88b17a336b 100644 (file)
@@ -1,19 +1,19 @@
-lines=20
-start_cmd=/usr/sbin/service rsyslog start
-others=1
-facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-signal_cmd=/usr/sbin/service rsyslog restart
-socket=0
+syslog_conf=/etc/rsyslog.conf
 compressed=1
-pid_file=/var/run/rsyslogd.pid
-restart_cmd=/usr/sbin/service rsyslog restart
-m4_path=
+socket=0
+syslogd=/usr/sbin/rsyslogd
 tags=0
-sync=1
-pipe=1
-syslog_conf=/etc/rsyslog.conf
-pri_dir=1
 pri_all=1
+pid_file=/var/run/rsyslogd.pid
+start_cmd=/usr/sbin/service rsyslog start
+sync=1
 reverse=0
 m4_conf=0
-syslogd=/usr/sbin/rsyslogd
+pipe=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
+restart_cmd=/usr/sbin/service rsyslog restart
+pri_dir=1
+others=1
+m4_path=
+lines=20
index b6a7e4155594fba9d042e3e77f367757be828a52..c627a9fec943a9bb9cf121b1f02e78452fb485a9 100644 (file)
@@ -1,2 +1,2 @@
-collect_interval=5
 collect_pkgs=1
+collect_interval=5
index c736182c8dffd80fe3bad07089d964a079dd05fd..d3c23b2ba396ea9f591afa6b67cbd186dbee3f7d 100755 (executable)
@@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf";
 $ENV{'PERLLIB'} = "$root";
 $ENV{'WEBMIN_CONFIG'} = "/etc/webmin";
 $ENV{'WEBMIN_VAR'} = "/var/webmin";
+delete($ENV{'MINISERV_CONFIG'});
 chdir("$root/system-status");
 exec("$root/system-status/enable-collection.pl", @ARGV) || die "Failed to run $root/system-status/enable-collection.pl : $!";
index 564a384c656acd51de73ca8b20f41c9c30e97d52..b5cbb0cf2242771e28cfd38ae54e976923b60ebe 100644 (file)
@@ -1,5 +1,5 @@
+sizemode=0
+detach=0
 proxy=0
 no_test=0
-sizemode=0
 mode=1
-detach=0
index 2d666d1a74a5ce6aee2b63f94737bc705e60e161..767c675bee8d5485aea88e318b23411ef49d9ee7 100644 (file)
@@ -1,6 +1,6 @@
-lease=5
-ntp_only=1
 zone_style=linux
 timeserver_hardware=1
+ntp_only=1
 seconds=1
 timeserver=0.pool.ntp.org
+lease=5
index c48b57f393da4c20b45a5e4ea78bad1ab8806aed..11e3f233e237510e02d835a6beec13bf9b08603a 100644 (file)
@@ -1,41 +1,41 @@
-skip_md5=0
-from_files=0
+group_file=/etc/group
 uid_calc=0
 base_uid=1000
+passwd_progmode=0
+email_type=0
 base_gid=1000
-passwd_file=/etc/passwd
-default_group=users
-default_other=1
-shadow_file=/etc/shadow
-user_files=/etc/skel
-selinux_con=user_u:object_r:user_home_dir_t
+lock_string=*
+new_user_group=0
+extra_real=0
 last_show=0
+display_max=400
+sort_mode=0
+display_mode=1
+from_files=0
+gshadow_file=/etc/gshadow
 md5=1
-alias_check=0
-email_type=0
+uid_mode=1
+passwd_same=0
 delete_only=0
-secmode=0
-gshadow_file=/etc/gshadow
+shadow_file=/etc/shadow
+selinux_con=user_u:object_r:user_home_dir_t
+default_group=users
+default_other=1
 empty_mode=0
-uid_mode=1
-extra_real=0
-sort_mode=0
+secmode=0
+passwd_file=/etc/passwd
+passwd_dict=0
+user_files=/etc/skel
+new_user_gid=0
+passwd_stars=0
+home_base=/home
+shells=fixed,passwd,shells
+gid_mode=1
+delete_root=0
+skip_md5=0
 home_style=0
-display_max=400
 membox=0
 random_password=0
-passwd_dict=0
-group_file=/etc/group
-new_user_group=0
-passwd_progmode=0
 gid_calc=0
-home_base=/home
-delete_root=0
-display_mode=1
-passwd_same=0
-new_user_gid=0
-shells=fixed,passwd,shells
+alias_check=0
 homedir_perms=0755
-lock_string=*
-passwd_stars=0
-gid_mode=1
index 0a1a3187e56ef834697da7d98ed7339d9469eb85..6991ccf5339d34182cd5340f10d43f756e5352c7 100644 (file)
@@ -1,7 +1,7 @@
-uphour=4
-upshow=1
+cron_mode=0
+updays=1
 usermin_dir=/etc/usermin
+upshow=1
 upmissing=0
-updays=1
 update=0
-cron_mode=0
+uphour=4
index 495aca49f127ce5298a8351b09ea6178fe21e39d..ecba942f0e4af81715729b216f115900f705168b 100644 (file)
@@ -1 +1 @@
-1.974
+1.979
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 929b33a86c0551e135de04e28a478742d7c378b3..b382cbf167267c4e3449dd7368c3d8ae3b39e430 100644 (file)
@@ -1,6 +1,6 @@
-webalizer=/usr/bin/webalizer
 naked=0
-auto=apache,squid,proftpd,wuftpd
-alt_conf=/etc/webalizer/webalizer.conf.sample
 webalizer_conf=/etc/webalizer/webalizer.conf
 skip_old=0
+alt_conf=/etc/webalizer/webalizer.conf.sample
+auto=apache,squid,proftpd,wuftpd
+webalizer=/usr/bin/webalizer
index 982ceb0b5f0929a3dbed65d4935c3579613c2e45..29b9d5d844d50d0db0dacf7e0d816d8950e43ffb 100644 (file)
@@ -1,12 +1,12 @@
-last_version_number=1.900
-updays=1
+cron_mode=0
 upmissing=0
 update=0
+letsencrypt_dns_wait=10
 osdn=1
-uphour=23
 upshow=1
-cron_mode=0
-letsencrypt_dns_wait=10
-warn_days=7
 upmins=47
+updays=1
 last_version_check=1549050668
+uphour=23
+warn_days=7
+last_version_number=1.900
index e783e2db87dd7bb2b2659892ecf2f32495c71214..7deb33731bd1b5d0d3efbb6a22c94a4ee1b1e9cc 100644 (file)
@@ -1,8 +1,8 @@
-ftpd_path=/usr/sbin/wu-ftpd
-ftphosts=/etc/wu-ftpd/ftphosts
+ftpaccess=/etc/wu-ftpd/ftpaccess
 pid_file=/var/run/ftpd.pids-all
+log_file=/var/log/xferlog
+ftphosts=/etc/wu-ftpd/ftphosts
+ftpgroups=/etc/wu-ftpd/ftpgroups
 ftpusers=/etc/wu-ftpd/ftpusers
-ftpaccess=/etc/wu-ftpd/ftpaccess
+ftpd_path=/usr/sbin/wu-ftpd
 ftpconversions=/etc/wu-ftpd/ftpconversions
-ftpgroups=/etc/wu-ftpd/ftpgroups
-log_file=/var/log/xferlog
index 74d1cb77f2b595040152a0cdad5e7b4d3c5855a5..653c3a4bca08ae733481ace5ebbfdca68d1e1fb2 100644 (file)
@@ -1,5 +1,5 @@
-lookup_servs=1
 pid_file=/var/run/xinetd.pid
 start_cmd=/etc/init.d/xinetd start
 protocols_file=/etc/protocols
 xinetd_conf=/etc/xinetd.conf
+lookup_servs=1