From e0818c0e48e356ea355f34871d90c44738993dc1 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 29 Aug 2019 08:04:07 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -dovecot-core 1:2.2.33.2-1ubuntu4.3 amd64 -dovecot-imapd 1:2.2.33.2-1ubuntu4.3 amd64 -dovecot-lmtpd 1:2.2.33.2-1ubuntu4.3 amd64 -dovecot-managesieved 1:2.2.33.2-1ubuntu4.3 amd64 -dovecot-mysql 1:2.2.33.2-1ubuntu4.3 amd64 -dovecot-sieve 1:2.2.33.2-1ubuntu4.3 amd64 -dpkg 1.19.0.5ubuntu2.1 amd64 +dovecot-core 1:2.2.33.2-1ubuntu4.5 amd64 +dovecot-imapd 1:2.2.33.2-1ubuntu4.5 amd64 +dovecot-lmtpd 1:2.2.33.2-1ubuntu4.5 amd64 +dovecot-managesieved 1:2.2.33.2-1ubuntu4.5 amd64 +dovecot-mysql 1:2.2.33.2-1ubuntu4.5 amd64 +dovecot-sieve 1:2.2.33.2-1ubuntu4.5 amd64 +dpkg 1.19.0.5ubuntu2.2 amd64 -libcups2 2.2.7-1ubuntu2.6 amd64 +libcups2 2.2.7-1ubuntu2.7 amd64 -libldap-2.4-2 2.4.45+dfsg-1ubuntu1.3 amd64 -libldap-common 2.4.45+dfsg-1ubuntu1.3 all +libldap-2.4-2 2.4.45+dfsg-1ubuntu1.4 amd64 +libldap-common 2.4.45+dfsg-1ubuntu1.4 all -libnet-ssleay-perl 1.84-1ubuntu0.1 amd64 +libnet-ssleay-perl 1.84-1ubuntu0.2 amd64 -libprocps6 2:3.3.12-3ubuntu1.1 amd64 +libprocps6 2:3.3.12-3ubuntu1.2 amd64 -libzstd1 1.3.3+dfsg-2ubuntu1 amd64 +libzstd1 1.3.3+dfsg-2ubuntu1.1 amd64 -procps 2:3.3.12-3ubuntu1.1 amd64 +procps 2:3.3.12-3ubuntu1.2 amd64 -webmin 1.920 all +webmin 1.930 all --- .etckeeper | 6 ++ letsencrypt/csr/0640_csr-certbot.pem | 16 ++++++ letsencrypt/csr/0641_csr-certbot.pem | 17 ++++++ letsencrypt/csr/0642_csr-certbot.pem | 17 ++++++ letsencrypt/keys/0640_key-certbot.pem | 28 +++++++++ letsencrypt/keys/0641_key-certbot.pem | 28 +++++++++ letsencrypt/keys/0642_key-certbot.pem | 28 +++++++++ webmin/acl/config | 2 +- webmin/adsl-client/config | 8 +-- webmin/ajaxterm/config | 2 +- webmin/apache/config | 36 ++++++------ webmin/at/config | 2 +- webmin/backup-config/config | 4 +- webmin/bacula-backup/config | 14 ++--- webmin/bind8/config | 66 ++++++++++----------- webmin/burner/config | 4 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 10 ++-- webmin/cluster-usermin/config | 2 +- webmin/cluster-webmin/config | 2 +- webmin/config | 42 +++++++------- webmin/cpan/config | 8 +-- webmin/cron/config | 34 +++++------ webmin/custom/config | 2 +- webmin/dhcpd/config | 20 +++---- webmin/dovecot/config | 4 +- webmin/exim/config | 8 +-- webmin/exports/config | 2 +- webmin/fail2ban/config | 2 +- webmin/fetchmail/config | 4 +- webmin/filter/config | 6 +- webmin/firewall/config | 6 +- webmin/firewall6/config | 8 +-- webmin/firewalld/config | 2 +- webmin/fsdump/config | 6 +- webmin/grub/config | 4 +- webmin/heartbeat/config | 18 +++--- webmin/htaccess-htpasswd/config | 8 +-- webmin/inetd/config | 22 +++---- webmin/init/config | 22 +++---- webmin/ipfilter/config | 10 ++-- webmin/ipfw/config | 8 +-- webmin/ipsec/config | 6 +- webmin/iscsi-client/config | 6 +- webmin/iscsi-server/config | 6 +- webmin/iscsi-target/config | 10 ++-- webmin/iscsi-tgtd/config | 6 +- webmin/jabber/config | 6 +- webmin/ldap-client/config | 4 +- webmin/ldap-server/config | 12 ++-- webmin/ldap-useradmin/config | 38 ++++++------- webmin/logrotate/config | 2 +- webmin/lpadmin/config | 24 ++++---- webmin/lvm/config | 2 +- webmin/mailboxes/config | 82 +++++++++++++-------------- webmin/man/config | 8 +-- webmin/miniserv.conf | 6 +- webmin/mon/config | 6 +- webmin/mount/config | 10 ++-- webmin/mysql/config | 32 +++++------ webmin/net/config | 2 +- webmin/nis/config | 4 +- webmin/openslp/config | 4 +- webmin/pam/config | 4 +- webmin/pap/config | 10 ++-- webmin/passwd/config | 2 +- webmin/postfix/config | 38 ++++++------- webmin/postgresql/config | 34 +++++------ webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 6 +- webmin/pptp-server/config | 10 ++-- webmin/proc/config | 8 +-- webmin/procmail/config | 2 +- webmin/proftpd/config | 10 ++-- webmin/qmailadmin/config | 16 +++--- webmin/quota/config | 30 +++++----- webmin/raid/config | 2 +- webmin/samba/config | 20 +++---- webmin/sarg/config | 4 +- webmin/sendmail/config | 48 ++++++++-------- webmin/servers/config | 14 ++--- webmin/shell/config | 2 +- webmin/shorewall/config | 4 +- webmin/shorewall6/config | 4 +- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 16 +++--- webmin/squid/config | 30 +++++----- webmin/sshd/config | 6 +- webmin/status/config | 18 +++--- webmin/syslog-ng/config | 8 +-- webmin/syslog/config | 28 ++++----- webmin/system-status/config | 2 +- webmin/tcpwrappers/config | 4 +- webmin/telnet/config | 2 +- webmin/time/config | 2 +- webmin/updown/config | 4 +- webmin/useradmin/config | 64 ++++++++++----------- webmin/usermin/config | 10 ++-- webmin/version | 2 +- webmin/webalizer/config | 6 +- webmin/webmin/config | 10 ++-- webmin/wuftpd/config | 10 ++-- webmin/xinetd/config | 4 +- 104 files changed, 728 insertions(+), 588 deletions(-) create mode 100644 letsencrypt/csr/0640_csr-certbot.pem create mode 100644 letsencrypt/csr/0641_csr-certbot.pem create mode 100644 letsencrypt/csr/0642_csr-certbot.pem create mode 100644 letsencrypt/keys/0640_key-certbot.pem create mode 100644 letsencrypt/keys/0641_key-certbot.pem create mode 100644 letsencrypt/keys/0642_key-certbot.pem diff --git a/.etckeeper b/.etckeeper index 8e151ea56..83c959d2f 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1870,6 +1870,9 @@ maybe chmod 0644 'letsencrypt/csr/0636_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/0637_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/0638_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/0639_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/0640_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/0641_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/0642_csr-certbot.pem' maybe chmod 0700 'letsencrypt/keys' maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem' @@ -2511,6 +2514,9 @@ maybe chmod 0600 'letsencrypt/keys/0636_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0637_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0638_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0639_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/0640_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/0641_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/0642_key-certbot.pem' maybe chmod 0700 'letsencrypt/live' maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online' maybe chmod 0644 'letsencrypt/live/collabora.hoellein.online/README' diff --git a/letsencrypt/csr/0640_csr-certbot.pem b/letsencrypt/csr/0640_csr-certbot.pem new file mode 100644 index 000000000..c4a707eaa --- /dev/null +++ b/letsencrypt/csr/0640_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICcjCCAVoCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcP +VMQIgKPrM8AuPRkoZtJ4xGB8rLwYsEHnc+Pb3Cf/Ew/8C2NL0/CsPM/k7CcV5Hot +HRrS7TfH2KvgHRJP0rqJeNjRT+Rls67axqT0DYfOGSbjeTKWCdtKnCCVJA3+7xD2 +fnnIZKOHQBhgCIwqO7esyC5+Y7vPud9nqnDamO2S7TfWh5xDx39lvQd47wfu8cZ1 +OVKOdiv/hdgYnOGca3TvqUs5bVv5szX/AE7/AowrSVuEZuEcJxYhVZJoYATeC+EY +DCUURrJIjUbMHdWGhc8YrC74cvO5ZbAaNwkcJyPfvJIZf7Q91AF42km6NP4z4QZ1 +mvDh2YIjgmpvnIlSEYsCAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBwwGgYDVR0RBBMw +EYIPaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQA8xqptIew/L22e +1+AuqpwSGXro/TSrr5yByhdtiz06uuhb7wpP0OE7vKnPsjMDRcVo1A2wleTazUYy +GcAYXcLW8W67ekON9Hk3GLsv4UYuYWWFN0u4pkXCO/s0vy+yfu72Q9qwxFrftnoq +AJ1BKfvQ7Hod5/BKWkPzCHVwmvCV8QpwKYrZomXmzA1cVlVQuYyxiJfBINbEPoju +laoN9DNuEfbP9fYBNNCTYyI3lThbF3V0SZ+Uuxpp6687qozuf24AMatiSGS+Ju4m +Z6oBUA2TpiPvbymmK33L+7VfCtRKCOlpJyQJ5IygSQu0g+AJpB82l7dp6BSrqRhh +H0S5IUZa +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/0641_csr-certbot.pem b/letsencrypt/csr/0641_csr-certbot.pem new file mode 100644 index 000000000..ba669848c --- /dev/null +++ b/letsencrypt/csr/0641_csr-certbot.pem @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4Z +hpprjBfc+CZBLQJqaK5neJUZOc0M/hHt8UryOqThJFNIfsIyfMDrfjUJxo8cEKb8 +MApPDbtV3J+LlF/yn3l//Wm9nIIYEia37Lqsmh0SKZPDRDB4ezD6txCYBR72pX3k +JnT2Vm/PbGRqcfwuVbSBGDZzsisgrReszdeI66o3ZsnU2d892qcwm7QnVwvik57H +tEWw77ryl/+LsjWWp4MIhEaMqYAQF3BekWiAvciCgmYZxueXSZi4/XIvP3x4lIOk +RBBF7k1Dt8dHzX9aPneruUjXQiUnSQbNmHi1p0+3eM+Y1WzX4c5Sh4FTbb+vCgHQ +rU2jYYDcuKbAH1uO0F8CAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw +QoIUbWFpbC5ob2VsbGVpbi5vbmxpbmWCFGltYXAuaG9lbGxlaW4ub25saW5lghRz +bXRwLmhvZWxsZWluLm9ubGluZTANBgkqhkiG9w0BAQsFAAOCAQEAlaNxJJCmH7yk +ws6zDwQGZN42sRMYWbsuag3RGEEXoyIwy/POgEgROldUnbdnuts03u/JIbH999km +z1ck26hk3+4HW7oPfDom1j+Ozukuy1MDuply20eIRlTz1wB7au8Dmca2YcOlBiGz +F1L6EInA829R4yKd5jcI1u79baZ2KkWAAU++OuXHHmwt0ENRX8wkj4vU91x5vttV +LPmsvFvMoMmcg2FDwnJQzwsjZfOtqqup7sp2W7WdzdAYD8D0HIsO/KZricxTSr2+ +A8OVWCan6t5n2U29Zq6QphGP+LgyCd8zDByiz6ciHrcSVdniSgQ+5EemGO2NzCS/ +CvHZe+OPCA== +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/0642_csr-certbot.pem b/letsencrypt/csr/0642_csr-certbot.pem new file mode 100644 index 000000000..fd2612985 --- /dev/null +++ b/letsencrypt/csr/0642_csr-certbot.pem @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxt +Yz50GaTr0zlqWen9s9rISyp+R4jSD4DgODpmhGUlzd20+Vf+FIJE5hH9e0JKG1PB +Ntd8LCWLif6y2K3EbiEQruwVeNM4mRVL5tubmYZUJmqyIliHHj0pKRv4vY2loFKM +IiSqH48KvgYn2ybvRbQqXyqx3lkG3xsuhnYFWccXVWMwu63jWF0Iy0EP3BdzGq8Y +hzQ/lDiEdR1bbxuMhUUVc7TYKsYjtc6sSYzYz0vGNekn1rRtxq+MffF3KNKkLil9 +KFKBcmn2uIhhXvshvK4zOiqmcPYsRGJCWBqGayadhYnmnjAAUBF4K5Y+lEgLZRiO +e/Xr7IFsxvHu9lkjICcCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw +QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy +ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAgLnPUJVyP9w6 +EDa/2ETPAxzHLNAsIr1QtZhf3QdYXHwxqembSgo0Lazj7dIo5jXJWaTOXr3ObcM+ +AGVBq1nQIfe9qGKaqiGuaU+BivfVvlxT/J6E45eRRN6d3YyDd3UxjrX02kuI6Dvv +KFHuMn9pGPBskkKSbF9YPR/rwQYT5xs5hTrt6ZmGqVeijyE/MbPq0MK8CNB711gK +/ptMIDv1liQ/Dsj95WxsIhRsooP9d+OMuNO+iTmmz+VfnnPeU/BIqYz+uuNsM64z +dQiwHcvar94cYsl8qHmCoFDIdWWsQ6P9efwjpWkL3PysAnNlXLtGUqSS0gZWUbRs +x8PN/+M3Dg== +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/0640_key-certbot.pem b/letsencrypt/keys/0640_key-certbot.pem new file mode 100644 index 000000000..8a2fa732b --- /dev/null +++ b/letsencrypt/keys/0640_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDHD1TECICj6zPA +Lj0ZKGbSeMRgfKy8GLBB53Pj29wn/xMP/AtjS9PwrDzP5OwnFeR6LR0a0u03x9ir +4B0ST9K6iXjY0U/kZbOu2sak9A2Hzhkm43kylgnbSpwglSQN/u8Q9n55yGSjh0AY +YAiMKju3rMgufmO7z7nfZ6pw2pjtku031oecQ8d/Zb0HeO8H7vHGdTlSjnYr/4XY +GJzhnGt076lLOW1b+bM1/wBO/wKMK0lbhGbhHCcWIVWSaGAE3gvhGAwlFEaySI1G +zB3VhoXPGKwu+HLzuWWwGjcJHCcj37ySGX+0PdQBeNpJujT+M+EGdZrw4dmCI4Jq +b5yJUhGLAgMBAAECggEASZCk5v2tbObTbUapVc7UkRwIlw/8VldZbEG5VpA+QJnH +1bR0EPJJFTzSDJKxo5A3q99YTj19ZYv5yys8EzRk0INVoetY9zOOwCQiHXwENBg6 +u2B9vfAtHFnqcTAs7u80MrSl8SPZ7YVibp+vCP3iq/Ky2FvlR9dw/ds15hcjRUjM +b4tSNRUztPehAGu5Rz6GLW8xaHzSRjM6+xyKtxWXLeZiOXSN55LG37PZWNJmPURU +3RmuZRVRERnCHhxrMJVDu922rAizt/LUSlAxZtd0pcSRc5w3oVhDSjZ0Z9Ee+DTm +pAFy3LSLqsCXT70Eotz0E80M3McoMVCL8WR0upv3wQKBgQDoCNVBsUp4HhvLkOyq +tdZ2PFE50N6LCFngleWLGxpejy1m1/KsVeutWoz5Ak6H2vMIBudGyfxs3d46T7/B +yen9rWkcxidKTho/AAr5aQ9omr7QsgK0rPyP9vY5r0opWa7mr6s8EUHbTazfAtO8 +TXS2Kpik2wxrdJhZvtvVCfA+cwKBgQDbnp/X8hU/i3K4xCopULPX4KvlNl1Rdww+ +lIWfCKvs0CM/HKjOVxi8ZGak84aBi4Wae2Yq+BgYLkEgrGoIAITQ18uoc0TCi/BH +oGGNXuJ3VKOvWMstHZnn1bPsHodhrmotmqPNMKr19iwaOMaL+I/pG1q8Dxxy01FD +9ke9MP1CiQKBgAan+jYgN9qqQnHcfm2HOde6czoNW9TxMGLY6fTLmj4MLWk92KBI +9rHKXzDleAs9pKseR5QoRy14T9+sWfvdJvE4AEPrC0V+aBJWlfoBoYeGqOKjuKAm +NjiLBRUyihYVlIbZkzft5s27tLHRCvHj5u0y254fCoQqnBQ2/WdnGZUxAoGAWxNb +IkiIO0PvHWRsP5nyGvJXFsUGygPelg0tpJgKBDkEhOWzs243GdlhH8LF4u8jRr8p +zWP5Sf3UkGIvzoW4josPMBotR6iUyn9eNSxGKkp1XwApsdn2u0fKR38ZkY6tBaB9 +kVg/baTbATzOSbmYpIjthdOWbp/nsZFuiqzIOlECgYAQPvebo913svvD8dqwyaX+ +sxczFQzUZICnJxLKLtrs4aHWDgjeuUyoepPtySTN3uF+nhnMLGZXUIe7QzikrqfT +hqxia2wfDDZA9O1ztA1y15HvYJ2JP6mEgqnSOFNVmc/uGnda/s9h5E7Hl4i02MaG +MUE24PIWIwU/owbqKkz6aA== +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/0641_key-certbot.pem b/letsencrypt/keys/0641_key-certbot.pem new file mode 100644 index 000000000..e7398a8a3 --- /dev/null +++ b/letsencrypt/keys/0641_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCeGYaaa4wX3Pgm +QS0CamiuZ3iVGTnNDP4R7fFK8jqk4SRTSH7CMnzA6341CcaPHBCm/DAKTw27Vdyf +i5Rf8p95f/1pvZyCGBImt+y6rJodEimTw0QweHsw+rcQmAUe9qV95CZ09lZvz2xk +anH8LlW0gRg2c7IrIK0XrM3XiOuqN2bJ1NnfPdqnMJu0J1cL4pOex7RFsO+68pf/ +i7I1lqeDCIRGjKmAEBdwXpFogL3IgoJmGcbnl0mYuP1yLz98eJSDpEQQRe5NQ7fH +R81/Wj53q7lI10IlJ0kGzZh4tadPt3jPmNVs1+HOUoeBU22/rwoB0K1No2GA3Lim +wB9bjtBfAgMBAAECggEARYC9Puemx9rZsJ+YdOZorLtKNGnJkk5y51juad9BTri3 +anGFYEQnufwNGK36f3F8FJzrVazZQZEGk5EeImwcFaLhufmkc0C3whO7W3mDquIQ +Kyh9sr1Ukvy1O/NI1QrjSAvjqCmfaDoM0bxF7fJEtTzHczC7k+AimDTcrTNBPyu4 +/liSC/SzuZ6MLaLOYF+IfS95WjU6/IhAZUCNDVPck4LgcqswmOVFivh9HIjEV/w/ +pKn7xXed8nUmpgp7k1l8gY63ra51v58VX22V1jDbtNXklPksSSQa2BZOeRCpxZBi +ZyZj/DgZfvaALEiGsKQ3+uJErWcw2/A3zVve1OWtgQKBgQDJv5bT6SvhjYKlb1Ev +tOEDZVslEkVEVCNoDgJCGZziXVfSoSOohRKXGKdmOglSV2ry7+vCXd2E2Sjuhqlc +XB87cSk11BqLo+Cbx98JBsu8weOJjGqC5qnp72kKOy/M2ZhuwZCm6MSQanFO8atc +1zGYQfn50yvHhhOGL8+jcx7fwQKBgQDInSZpOaxcgiTVfRmBb+v9mS7xTK+NkPN8 +NAcKY6NQqfkzLtPbwiIUOwz1GGVf1KPNsAKHOxFbqvKP2xDeX8XrzEiFjgfCdt/l +ti8rWWOZe0QC0jADK8FxgBtleGoq6J5MMZWsUfpw6lODjDq4rHgkn1MOt7LEhbEz +IDqPib+4HwKBgF1a8HpCrXGDv+65ogHHW0/s+M4gtDi4DmI6CUV5AKWmt9rZgdyb +J00PtXaSaHnXxb+A0cFxGe49ZrlpSrlYT4N8C6vC6D2xqV+sj0JoCKLhvV6KwUat +YfbEOADp/mZ2Uhj+LOdvUnXZK3FyVu9xDJv9+6Rk2R9MpYA0Y4qo3KKBAoGAfQuH +b7tlNlxgvTm29jlfLbmXywxzuJgLTPXZFZ65o4PvMvoTUD2XpGiSUQud1LfkSkdV +rBkjXrIVc5mm0BV+dtXktmqrZ4lVUgfXKvwS2w48fE2rY66Yazjg2sTN2GUaln+p +vblzk4Jb//keeRH36UvuJ5RVN63ln+qM1f+Uox0CgYB7WRF3Xzvc/ABnvKUZFfg7 +Tq34JJz6PBeaNCn51lOmT5anon2nXr8CebYI1fUocfxVq7DBMs7cMu3FIpOdScbM +2RWJwI4ge6bZK/kVYZBxoVUfaiy0orOzxq7yGwQm7nUzEhCLcI+ooN5mYDZOl9fZ +E8x5tJv3elnOEVIzQvZyPw== +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/0642_key-certbot.pem b/letsencrypt/keys/0642_key-certbot.pem new file mode 100644 index 000000000..2a0fd2ac2 --- /dev/null +++ b/letsencrypt/keys/0642_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMbWM+dBmk69M5 +alnp/bPayEsqfkeI0g+A4Dg6ZoRlJc3dtPlX/hSCROYR/XtCShtTwTbXfCwli4n+ +stitxG4hEK7sFXjTOJkVS+bbm5mGVCZqsiJYhx49KSkb+L2NpaBSjCIkqh+PCr4G +J9sm70W0Kl8qsd5ZBt8bLoZ2BVnHF1VjMLut41hdCMtBD9wXcxqvGIc0P5Q4hHUd +W28bjIVFFXO02CrGI7XOrEmM2M9LxjXpJ9a0bcavjH3xdyjSpC4pfShSgXJp9riI +YV77IbyuMzoqpnD2LERiQlgahmsmnYWJ5p4wAFAReCuWPpRIC2UYjnv16+yBbMbx +7vZZIyAnAgMBAAECggEAFWnr+HHO8eCmGqCSVJl3ypYqkYPy2FkwuI5ENZHhknrY +Sr4XVGlQGqk+9Gl6DOKYZDicFwxxz2kDhoOTgPhPlPUbba1+H5oRJxLxVtXAyjps +X8bTJDTbLQrvvHdc28aauarmNLMBZUl5yElKgpST16CMoXtKUEcQ/dbszNYYpmsS +S/sB9CtqMjZrvZ30PoMbWt/QrLlTUn87qHMhB3iz1N6ROkqZqAQEGsQqWR2Y6AJ+ +HhERxyuJUhSfOzt+5YIqAAjSERm6o/XPzWP+mg9m4InK0qRhaeH/1xhGdPcd+yL/ +p7LGSSnZC2cHZr+T26vY3ixgWH2WwKD3cCOEFAY4KQKBgQDyWhni2pRIbZVAJqph +OL2l1S93elUP8ps1eEq3i1oY5HOO1Hve4KMtkkHjBrAApfWPB3CWuJFbaZdz1gBE +Ubm+kj+ogQq/99tT2V/ip/u+fHAea1gQU0ATZPZGycnqVmxioGcf6G2JZ9ObFUqW +EG+seyeAVE4ndfUzpQmzlYBD2wKBgQDX8IppuugzfLjxY8uy3PFsuPn4jHV1svcm ++GFlY8Guu8F5vurSt2LFEKnm8UKS/1W8wBwqAr+AIgxouA7PSPpD9BAv+2LLJMlm +bcE79YyB1Rt5QYRyYH4erR43h36tZ0HGl4Rqjh9HfgwgtvzrkAkJf1ZB5EtZMTc1 +lczm5bVspQKBgQCCuOL5oFkXcDRvM+v3IPn6tzExSwUS4xOhFc+HjVz9zEwgoLBo +Gdcqv5dWc8b/soTvr12ljsyo+B2/V5ExSLvd9Vjs9R3tSi493iSAR4fcyZZYciJA +PAd17qGAsVt+UTuJP2ggp+hdk2lqX2Op6heye4NlDxRQ6KloP/8ppNxYvQKBgQDF +RvMc7u2uBBbuKQ7yxFkny8JLKP8yXSLgjnBkcYODv/Jc6GedxH5OrQ+bdfQtWWoZ +u6S/WK1dQT32+ZhGFVTWegXD4DT8hAofMswjnAwWnPuxhoKa/76ZBe2iK342qyvz +Y39M3bSD2wr3ZFWiW392FshWAFw6CvV2VfnRRDDAJQKBgAFduCClRJxUzdNyT6ub +C88bmxhekSZfB5wacK5Lz6KihuG5V7HmKimwXok3hPl5KDQuW1+Ru4wWZlv+xktr +Pr+zvGTN83eLTSVvg335OVk7ZoOWUZjmnG2lHU7xbtS3DVEwaLaULLWRwmPVVWS3 +fjqv8Gf92vr91V7hb9aXq81K +-----END PRIVATE KEY----- diff --git a/webmin/acl/config b/webmin/acl/config index e5e83c2ab..ee9b4c16b 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ -order=0 display=1 ssleay=/usr/bin/openssl +order=0 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index 90d5445b4..605008979 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -start_cmd=adsl-start -conf_style=0 pppoe_cmd=pppoe -stop_cmd=adsl-stop status_cmd=adsl-status -pap_file=/etc/ppp/pap-secrets +stop_cmd=adsl-stop +conf_style=0 pppoe_conf=/etc/ppp/pppoe.conf +start_cmd=adsl-start +pap_file=/etc/ppp/pap-secrets diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config index a31edabcb..003ebb11c 100644 --- a/webmin/ajaxterm/config +++ b/webmin/ajaxterm/config @@ -1,2 +1,2 @@ -autologin=0 timeout=120 +autologin=0 diff --git a/webmin/apache/config b/webmin/apache/config index 3a4137132..cd3cde790 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -httpd_path=/usr/sbin/apache2 -show_names=0 -virt_file=/etc/apache2/sites-available -defines_name=APACHE_ARGUMENTS -show_order=0 -max_servers=100 -stop_cmd=/etc/init.d/apache2 stop -test_manual=0 +test_apachectl=1 test_always=0 -start_cmd=/etc/init.d/apache2 start allow_virtualmin=0 -access_conf=/etc/apache2/access.conf httpd_conf=/etc/apache2/apache2.conf -test_apachectl=1 -auto_mods=1 -apply_cmd=/usr/sbin/apache2ctl graceful -httpd_dir=/etc/apache2 -apachectl_path=/usr/sbin/apache2ctl -defines_file=/etc/apache2/envvars -link_dir=/etc/apache2/sites-enabled -srm_conf=/etc/apache2/srm.conf mime_types=/etc/apache2/mime.types +max_servers=100 +srm_conf=/etc/apache2/srm.conf +httpd_path=/usr/sbin/apache2 +link_dir=/etc/apache2/sites-enabled show_list=0 +httpd_dir=/etc/apache2 +defines_file=/etc/apache2/envvars +auto_mods=1 +test_manual=0 +show_names=0 +start_cmd=/etc/init.d/apache2 start +show_order=0 +access_conf=/etc/apache2/access.conf +virt_file=/etc/apache2/sites-available +defines_name=APACHE_ARGUMENTS test_config=1 +stop_cmd=/etc/init.d/apache2 stop +apachectl_path=/usr/sbin/apache2ctl +apply_cmd=/usr/sbin/apache2ctl graceful diff --git a/webmin/at/config b/webmin/at/config index 6f83c111c..abf2f6455 100644 --- a/webmin/at/config +++ b/webmin/at/config @@ -1,2 +1,2 @@ -at_style=linux at_dir=/var/spool/cron/atjobs +at_style=linux diff --git a/webmin/backup-config/config b/webmin/backup-config/config index 3bdfb1231..c13b50ad6 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -date_subs=0 -apply=1 webmin_subs=0 +apply=1 +date_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 2ed9f8aa8..19a63d752 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ +pass= +bls=bls +db=bacula driver=Pg +wait=1 +apply=1 showdirs=0 init_start=0 -btape=btape -bls=bls -apply=1 -pass= -db=bacula user=bacula -bextract=bextract -wait=1 +btape=btape bacula_dir=/etc/bacula +bextract=bextract diff --git a/webmin/bind8/config b/webmin/bind8/config index 37eeb7e78..cc8a44e88 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,45 +1,45 @@ -allow_long=0 -support_aaaa=1 -spf_record=0 -soa_start=0 -whois_cmd=whois -updserial_on=1 -signzone=dnssec-signzone -master_dir=/var/lib/bind -soa_style=0 -other_slaves=1 -keygen=dnssec-keygen -updserial_def=0 rev_must=0 -no_pid_chroot=0 -updserial_man=1 show_list=0 +ipv6_mode=1 +keygen=dnssec-keygen +spf_record=0 rndc_cmd=rndc -largezones=0 -master_ttl=1 -pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid -confirm_rec=0 -named_path=/usr/sbin/named -force_random=0 +updserial_on=1 +whois_cmd=whois +checkzone=named-checkzone +ndc_cmd=ndc checkconf=named-checkconf allow_comments=0 +zones_file=/etc/bind/named.conf.local +master_ttl=1 +allow_wild=1 +soa_style=0 +updserial_man=1 +allow_long=0 +force_random=0 +rndc_conf=/etc/bind/rndc.conf +rev_def=0 +soa_start=0 relative_paths=0 -allow_underscore=1 +other_slaves=1 +named_conf=/etc/bind/named.conf +no_pid_chroot=0 max_zones=50 by_view=0 -allow_wild=1 +support_aaaa=1 +allow_underscore=1 +largezones=0 +rndcconf_cmd=rndc-confgen +records_order=0 confirm_zone=1 -forwardzonefilename_format=ZONE.hosts +updserial_def=0 short_names=0 -rev_def=0 no_chroot=0 -records_order=0 -named_conf=/etc/bind/named.conf -zones_file=/etc/bind/named.conf.local -rndcconf_cmd=rndc-confgen -reversezonefilename_format=ZONE.rev +confirm_rec=0 +pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid +forwardzonefilename_format=ZONE.hosts slave_dir=/var/lib/bind -ipv6_mode=1 -checkzone=named-checkzone -rndc_conf=/etc/bind/rndc.conf -ndc_cmd=ndc +signzone=dnssec-signzone +master_dir=/var/lib/bind +named_path=/usr/sbin/named +reversezonefilename_format=ZONE.rev diff --git a/webmin/burner/config b/webmin/burner/config index e8769fdd4..d75260009 100644 --- a/webmin/burner/config +++ b/webmin/burner/config @@ -1,6 +1,6 @@ mkisofs=mkisofs -sox=sox -cdrdao=cdrdao cdrecord=cdrecord speed=1 +cdrdao=cdrdao +sox=sox mpg123=mpg123 diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-software/config +++ b/webmin/cluster-software/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index b92d9fe1e..287846959 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ conf_allow_refresh=1 -conf_add_user=1 +conf_host_links=1 +table_mode=0 +conf_allow_sync=1 conf_add_group=1 conf_find_group=1 -conf_allow_sync=1 -table_mode=0 -conf_host_links=1 -sort_mode=0 conf_find_user=1 +sort_mode=0 +conf_add_user=1 diff --git a/webmin/cluster-usermin/config b/webmin/cluster-usermin/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-usermin/config +++ b/webmin/cluster-usermin/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-webmin/config +++ b/webmin/cluster-webmin/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/config b/webmin/config index 9987b97b8..b3bd4d191 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -nofeedbackcc=0 -hostnamemode=0 -lang=en.UTF-8 -product=webmin +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +real_os_version=18.04.1 lang_root=de.UTF-8 +passwd_uindex=0 +product=webmin +showlogin=0 webprefix= -sysinfo=0 -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +passwd_cindex=2 +tempdelete_days=7 os_version=9.0 -referers_none=1 -passwd_uindex=0 -os_type=debian-linux +sysinfo=0 ld_env=LD_LIBRARY_PATH by_view=0 log=1 -hostnamedisplay= +help_height= +passwd_mindex=4 +hostnamemode=0 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin help_width= -showlogin=0 +real_os_type=Ubuntu Linux +lang=en.UTF-8 dateformat=dd/mon/yyyy -passwd_file=/etc/shadow -passwd_pindex=1 +os_type=debian-linux theme=authentic-theme -passwd_mindex=4 -real_os_version=18.04.1 -feedback_to= -passwd_cindex=2 showhost=0 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -real_os_type=Ubuntu Linux -tempdelete_days=7 md5pass=1 -help_height= +referers_none=1 +passwd_file=/etc/shadow +feedback_to= +passwd_pindex=1 +hostnamedisplay= +nofeedbackcc=0 diff --git a/webmin/cpan/config b/webmin/cpan/config index 84340ff2d..9f8e720af 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -incyum=1 -refresh_days=30 -save_partial=0 -incpackages=1 cpan=http://www.cpan.org/authors/id packages=http://www.cpan.org/modules/02packages.details.txt.gz +incpackages=1 +save_partial=0 +incyum=1 +refresh_days=30 diff --git a/webmin/cron/config b/webmin/cron/config index ac79258e0..da8002f96 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -show_time=0 -kill_subs=0 -run_parts=run-parts -hourly_only=0 -cron_allow_file=/var/spool/cron/allow -cron_user_edit_command=crontab -e -max_jobs=100 -show_run=0 cron_deny_file=/var/spool/cron/deny vixie_cron=1 +cron_delete_command=crontab -u USER -r +hourly_only=0 match_user=1 -system_crontab=/etc/crontab -cron_dir=/var/spool/cron/crontabs -match_mode=0 -cron_input=1 -max_len=80 +run_parts=run-parts +show_run=0 show_comment=0 -show_next=0 -cron_edit_command=crontab -u USER -e cron_deny_all=2 cron_user_get_command=crontab -l +cron_edit_command=crontab -u USER -e +max_len=80 +show_next=0 +show_time=0 +max_jobs=100 +cron_user_edit_command=crontab -e +cron_input=1 +cronfiles_dir=/etc/cron.d +match_mode=0 +system_crontab=/etc/crontab +cron_allow_file=/var/spool/cron/allow cron_get_command=crontab -u USER -l -cron_delete_command=crontab -u USER -r +cron_dir=/var/spool/cron/crontabs +kill_subs=0 cron_user_delete_command=crontab -r -cronfiles_dir=/etc/cron.d diff --git a/webmin/custom/config b/webmin/custom/config index dec7928fb..1a8539208 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ params_cmd=0 +display_mode=0 params_file=0 columns=2 -display_mode=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index c0686e7db..6355c2b1a 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,16 +1,16 @@ -lease_sort=0 -group_name=0 +lease_file=/var/lib/dhcp/dhcpd.leases interfaces_type=debian -dhcpd_path=/usr/sbin/dhcpd +group_name=0 dhcpd_conf=/etc/dhcp/dhcpd.conf +stop_cmd=service isc-dhcp-server stop +pid_file=/var/run/dhcpd.pid +start_cmd=service isc-dhcp-server start +lease_sort=0 +show_ip=0 +display_max=100 desc_name=0 restart_cmd=service isc-dhcp-server restart +dhcpd_path=/usr/sbin/dhcpd dhcpd_nocols=5 -show_ip=0 -lease_tz=0 show_mac=0 -lease_file=/var/lib/dhcp/dhcpd.leases -start_cmd=service isc-dhcp-server start -display_max=100 -pid_file=/var/run/dhcpd.pid -stop_cmd=service isc-dhcp-server stop +lease_tz=0 diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 3046deb50..139214874 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ init_script=dovecot -dovecot_config=/etc/dovecot/dovecot.conf -dovecot=/usr/sbin/dovecot pid_file=/var/run/dovecot/master.pid +dovecot=/usr/sbin/dovecot +dovecot_config=/etc/dovecot/dovecot.conf diff --git a/webmin/exim/config b/webmin/exim/config index 2b0ae6eba..858db69fb 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -mail_system=1 -exim_dbmfile=/etc/exim4/local_domains +exim_dir=/etc/exim4 exim_virt_dir=/etc/exim4/aliases +mail_system=1 exim_aliasfileext= -exim_dbmext=.dbm -exim_dir=/etc/exim4 exim_addrfile=/etc/exim4/email-addresses +exim_dbmfile=/etc/exim4/local_domains exim_mail_file=Maildir +exim_dbmext=.dbm diff --git a/webmin/exports/config b/webmin/exports/config index b8864bec5..d23f7b7df 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ -exports_file=/etc/exports restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi +exports_file=/etc/exports apply_cmd=exportfs -r diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index cae702a7a..4851099d2 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ init_script=fail2ban -config_dir=/etc/fail2ban server_cmd=/usr/bin/fail2ban-server +config_dir=/etc/fail2ban client_cmd=/usr/bin/fail2ban-client diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index b00c416d0..5998414b4 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ +daemon_user=root config_file= max_users=400 -pid_file=/var/run/fetchmail.pid -daemon_user=root fetchmail_path=fetchmail +pid_file=/var/run/fetchmail.pid view_mode=0 diff --git a/webmin/filter/config b/webmin/filter/config index 1ad8c0465..5bfe1ca4f 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ -virtualmin_config=/etc/webmin/virtual-server -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases warn_procmail=1 +reply_force=0 forward_procmail=0 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl -reply_force=0 +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases +virtualmin_config=/etc/webmin/virtual-server diff --git a/webmin/firewall/config b/webmin/firewall/config index 85d851b8d..255f687e5 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ force_init=0 -view_condition=1 -cluster_mode=1 direct=0 -comment_mod=0 view_comment=0 +cluster_mode=1 +comment_mod=0 +view_condition=1 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 91bcfc09d..d641b5002 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -comment_mod=0 -view_comment=0 +force_init=0 +direct=0 cluster_mode=1 +view_comment=0 +comment_mod=0 view_condition=1 -direct=0 -force_init=0 diff --git a/webmin/firewalld/config b/webmin/firewalld/config index ff329a00d..0aae64fac 100644 --- a/webmin/firewalld/config +++ b/webmin/firewalld/config @@ -1,2 +1,2 @@ -firewall_cmd=firewall-cmd init_name=firewalld +firewall_cmd=firewall-cmd diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 3db0b4e87..4de167a3e 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -webmin_subs=0 +date_subs=0 nonewtape=0 simple_sched=0 -date_subs=0 +webmin_subs=0 +run_mode=0 error_email=0 always_tar=0 -run_mode=0 diff --git a/webmin/grub/config b/webmin/grub/config index 49d2d2860..f6464eb2a 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ -menu_file=/boot/grub/menu.lst -grub_path=grub install=(hd0) +grub_path=grub +menu_file=/boot/grub/menu.lst diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 0cba32d44..33576bd81 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ req_resource_cmd=/usr/lib/heartbeat/req_resource -heartbeat=/usr/lib/heartbeat/heartbeat -resource_d= authkeys= -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys -serials=/dev/ttyS* -apply_cmd=/etc/init.d/heartbeat reload ha_dir=/etc/ha.d -haresources= -ha_cf= -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf -alt_haresources=/usr/share/doc/packages/heartbeat/haresources +apply_cmd=/etc/init.d/heartbeat reload pid_file=/var/run/heartbeat.pid +serials=/dev/ttyS* stop_cmd=/etc/init.d/heartbeat stop start_cmd=/etc/init.d/heartbeat start +resource_d= +ha_cf= +alt_haresources=/usr/share/doc/packages/heartbeat/haresources +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +haresources= +heartbeat=/usr/lib/heartbeat/heartbeat +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index fa141a725..743ab31dd 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -htaccess=.htaccess -md5=1 -sha1=0 +htgroups=.htgroups sort=0 +md5=1 digest=1 +sha1=0 htpasswd=.htpasswd -htgroups=.htgroups +htaccess=.htaccess extra_directives= diff --git a/webmin/inetd/config b/webmin/inetd/config index 499ad9424..1da638e37 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -rpc_protocols=tcp udp -inetd_conf_file=/etc/inetd.conf -rpc_file=/etc/rpc -display_max=100 -show_empty=1 -protocols_file=/etc/protocols -rpc_inetd=1 -deny_file=/etc/hosts.deny +qm_mode=0 tcpd_path=/usr/sbin/tcpd -restart_command=killall -HUP inetd -extended_inetd=1 +rpc_inetd=1 allow_file=/etc/hosts.allow services_file=/etc/services +deny_file=/etc/hosts.deny +show_empty=1 sort_mode=0 +rpc_file=/etc/rpc +extended_inetd=1 +rpc_protocols=tcp udp +display_max=100 +inetd_conf_file=/etc/inetd.conf +protocols_file=/etc/protocols +restart_command=killall -HUP inetd ipv6=0 -qm_mode=0 diff --git a/webmin/init/config b/webmin/init/config index e3a6ba222..1942f4aeb 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ +order=0 +atboot_product=webmin +init_info=1 +no_chkconfig=0 +expert=0 +init_dir=/etc/init.d inittab_id=id +order_digits=2 status_check=0 -init_info=1 +init_base=/etc/ +sort_mode=0 soft_links=1 show_opts=0 -sort_mode=0 -reboot_command=reboot -no_chkconfig=0 -init_base=/etc/ -order_digits=2 -init_dir=/etc/init.d -expert=0 -atboot_product=webmin -desc=1 -order=0 shutdown_command=poweroff +reboot_command=reboot boot_levels=2 3 5 +desc=1 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 5f11efea4..814076ea8 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ -cluster_nat=1 -ipf_conf=/etc/ipf/ipf.conf -ipnat=ipnat view_condition=1 -ipnat_conf=/etc/ipf/ipnat.conf -ipf=ipf +ipnat=ipnat +cluster_nat=1 ipfstat=ipfstat view_comment=0 +ipf=ipf +ipnat_conf=/etc/ipf/ipnat.conf +ipf_conf=/etc/ipf/ipf.conf cluster_mode=0 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 933e756be..90975175e 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -cluster_mode=0 -view_counters=0 +version=2 view_condition=1 -view_comment=0 ipfw=/sbin/ipfw -version=2 +view_comment=0 +view_counters=0 +cluster_mode=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 177bcb69e..294051fa6 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -ipsec=/usr/sbin/ipsec policies_dir=/etc/ipsec.d/policies restart_cmd=/etc/init.d/ipsec restart -stop_cmd=/etc/init.d/ipsec stop +logfile=/var/log/messages secrets=/etc/ipsec.secrets start_cmd=/etc/init.d/ipsec start -logfile=/var/log/messages file=/etc/ipsec.conf +ipsec=/usr/sbin/ipsec +stop_cmd=/etc/init.d/ipsec stop diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 323769eb9..845b731f5 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -config_file=/etc/iscsi/iscsid.conf -initiator_file=/etc/iscsi/initiatorname.iscsi iscsiadm=iscsiadm -init_name=open-iscsi +initiator_file=/etc/iscsi/initiatorname.iscsi iscsiiname=iscsi-iname +config_file=/etc/iscsi/iscsid.conf ifaces_dir=/var/lib/iscsi/ifaces +init_name=open-iscsi diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index de7785e59..90c99023f 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -opts_file=/etc/sysconfig/netbsd-iscsi -targets_file=/etc/iscsi/targets -pid_file=/var/run/iscsi-target.pid auths_file=/etc/iscsi/auths iscsi_server=/usr/sbin/iscsi-target init_name=netbsd-iscsi +targets_file=/etc/iscsi/targets +pid_file=/var/run/iscsi-target.pid +opts_file=/etc/sysconfig/netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 29c489c37..e5fe74070 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -opts_file=/etc/default/iscsitarget -targets_file=/etc/iet/targets.allow pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid -config_file=/etc/iet/ietd.conf -init_name=iscsitarget -ietadm=ietadm +targets_file=/etc/iet/targets.allow +opts_file=/etc/default/iscsitarget initiators_file=/etc/iet/initiators.allow +ietadm=ietadm +init_name=iscsitarget +config_file=/etc/iet/ietd.conf diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 01aef2fc0..618c982d6 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ +config_file=/etc/tgt/targets.conf +tgtadm=tgtadm +tgtd=tgtd tgtadmin=tgt-admin init_name=tgtd -tgtd=tgtd -tgtadm=tgtadm -config_file=/etc/tgt/targets.conf diff --git a/webmin/jabber/config b/webmin/jabber/config index c8a6e69cd..d86c944ad 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -jabber_daemon=/usr/sbin/jabberd -jabber_config=/etc/jabber/jabber.xml stop_cmd=/etc/init.d/jabberd stop -start_cmd=/etc/init.d/jabberd start jabber_dir=/var/lib/jabber +jabber_config=/etc/jabber/jabber.xml +start_cmd=/etc/init.d/jabberd start +jabber_daemon=/usr/sbin/jabberd diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 4587ce571..55d1e7111 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -auth_ldap=/etc/ldap.conf -init_name=nslcd secret=/etc/ldap.secret +init_name=nslcd +auth_ldap=/etc/ldap.conf diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index 38f0c81f7..3ae2d913d 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ +ldap_user=openldap +browse_max=100 attr_count=6 -init_name=slapd +config_file=/etc/ldap/slapd.d schema_dir=/etc/ldap/schema -stop_cmd=/etc/init.d/slapd stop +init_name=slapd start_cmd=/etc/init.d/slapd start -browse_max=100 -slapd=slapd -config_file=/etc/ldap/slapd.d -ldap_user=openldap +stop_cmd=/etc/init.d/slapd stop apply_cmd=/etc/init.d/slapd restart +slapd=slapd diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 6a4add16e..181576087 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -samba_class=sambaSamAccount -given_order=0 -person=1 -secmode=0 -alias_same=0 -ldap_tls=0 -mailfmt=0 -md5=0 -imap_login=cyrus -membox=0 -samba_def=0 -slappasswd=slappasswd -quota_support=0 -imap_foldersep=. -imap_folders=old public sent-mail -imap_def=0 -auth_ldap=/etc/ldap.conf -shells=fixed,ldap,passwd,shells +imap_class=SuSEeMailObject given=0 other_class=inetOrgPerson +imap_foldersep=. samba_gclass=sambaGroup +shells=fixed,ldap,passwd,shells +membox=0 +alias_same=0 +imap_folders=old public sent-mail +given_order=0 multi_fields=0 -imap_class=SuSEeMailObject gecos=1 +md5=0 +person=1 +samba_class=sambaSamAccount +quota_support=0 +slappasswd=slappasswd +imap_def=0 +samba_def=0 +ldap_tls=0 +auth_ldap=/etc/ldap.conf +mailfmt=0 +imap_login=cyrus +secmode=0 diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 80a83e4f0..d4738546a 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ logrotate=logrotate sort_mode=0 -logrotate_conf=/etc/logrotate.conf add_file=/etc/logrotate.d +logrotate_conf=/etc/logrotate.conf diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 01f572536..9672cbdcd 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -iface_arg= -gs_path=gs -iface_owner=lp:lp -show_jobs=0 -model_path=/usr/share/foomatic/db /usr/share/ppd -sort_mode=0 -gs_fontpath= -show_status=0 -print_style=cups spool_dir=/var/spool/cups -smbclient_path=smbclient -start_cmd=/etc/init.d/cupsys start +sort_mode=0 iface_perms=755 -stop_cmd=/etc/init.d/cupsys stop +iface_arg= +model_path=/usr/share/foomatic/db /usr/share/ppd +show_jobs=0 gs_lib= +smbclient_path=smbclient display_mode=0 +gs_path=gs +print_style=cups +stop_cmd=/etc/init.d/cupsys stop driver_style=cups +start_cmd=/etc/init.d/cupsys start +iface_owner=lp:lp +gs_fontpath= +show_status=0 diff --git a/webmin/lvm/config b/webmin/lvm/config index a5ef0ed4d..63b743f61 100644 --- a/webmin/lvm/config +++ b/webmin/lvm/config @@ -1,2 +1,2 @@ -show_table=0 lvm_conf=/etc/lvm/lvm.conf +show_table=0 diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 0cae89159..07cd8222d 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -show_size_below=0 -size_mode=1 -fwd_mode=0 -show_mail=0 -top_buttons=2 -column_count=4 -show_count=0 -view_html=0 -no_crlf=0 -noindex_hostname=0 -vpopmail_dir=/home/vpopmail -spam_buttons=mail -html_edit=0 from_virtualmin=1 +view_html=0 mail_dir=Maildir -html_quote=0 -spam_report= -delete_warn=y -check_mod=1 -sort_mode=1 -show_size=1 -show_body=0 date_fmt=dmy -track_read=0 -maildir_deleted=0 -link_mode=0 -show_delall=0 -max_records=200 +noindex_hostname=0 +sync_perms=0700 +show_size_below=0 show_sent=0 -mail_style=0 +sync_modify=1 +no_crlf=0 +show_to=0 +show_count=0 +mail_file=Mailbox log_read=0 -spam_del=0 +mail_usermin=mail +arrows=1 +column_count=4 +html_edit=0 perpage=20 -mailbox_user=.usermin/mailbox -mail_file=Mailbox -wrap_width=80 -auto=1 -sync_delete=1 -show_to=0 sync_create=0 -show_unread=0 -sync_perms=0700 +mail_system=3 no_orig_ip=0 -sig_file=* -ignore_users_enabled=0 +link_mode=0 +sort_mode=1 no_mailer=0 ignore_users= -mail_usermin=mail -arrows=1 -mail_system=3 +wrap_width=80 +show_delall=0 +auto=1 open_mode=0 -sync_modify=1 +sync_delete=1 +delete_warn=y +top_buttons=2 +check_mod=1 +mail_style=0 +html_quote=0 +vpopmail_dir=/home/vpopmail +fwd_mode=0 +spam_del=0 +spam_buttons=mail +show_size=1 +show_mail=0 +show_unread=0 +ignore_users_enabled=0 +sig_file=* +mailbox_user=.usermin/mailbox +show_body=0 +max_records=200 +maildir_deleted=0 +track_read=0 +spam_report= +size_mode=1 diff --git a/webmin/man/config b/webmin/man/config index 009ff7463..882e20967 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -man_cmd=man PAGE list_cmd_sect=man -w SECTION PAGE -kernel_dir=/usr/src/linux/Documentation +man_cmd=man PAGE search_cmd=man -k PAGE -list_cmd=man -w PAGE +doc_dir=/usr/share/doc man2html_path=man2html +list_cmd=man -w PAGE man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man man_cmd_sect=man SECTION PAGE -doc_dir=/usr/share/doc +kernel_dir=/usr/src/linux/Documentation diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index 67b0aa9c0..94a7a8167 100644 --- a/webmin/miniserv.conf +++ b/webmin/miniserv.conf @@ -42,9 +42,9 @@ failed_script=/etc/webmin/failed.pl sudo=1 nolog=.*xhr.* logouttimes= -root=/usr/share/webmin -mimetypes=/usr/share/webmin/mime.types -server=MiniServ/1.920 error_handler_403=403.cgi error_handler_404=404.cgi error_handler_401=401.cgi +root=/usr/share/webmin +mimetypes=/usr/share/webmin/mime.types +server=MiniServ/1.930 diff --git a/webmin/mon/config b/webmin/mon/config index b8ba843df..0b621b587 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ stop_cmd=/etc/init.d/mon stop pid_file=/var/run/mon.pid -mon_cgi=/var/www/cgi-bin/mon.cgi +restart_cmd=/etc/init.d/mon restart start_cmd=/etc/init.d/mon start -monshow=/usr/bin/monshow +mon_cgi=/var/www/cgi-bin/mon.cgi cfbasedir=/etc/mon -restart_cmd=/etc/init.d/mon restart +monshow=/usr/bin/monshow diff --git a/webmin/mount/config b/webmin/mount/config index 64e78541c..c0061e6c3 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,8 +1,8 @@ -smbclient_path=smbclient +nfs_check=1 +fstab_file=/etc/fstab +autofs_file=/etc/auto.master +nmblookup_path=nmblookup long_fstypes=1 +smbclient_path=smbclient show_used=1 -nmblookup_path=nmblookup auto_file=/etc/am-utils/amd.conf -autofs_file=/etc/auto.master -fstab_file=/etc/fstab -nfs_check=1 diff --git a/webmin/mysql/config b/webmin/mysql/config index 21d7b0756..bcc0afe1f 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -passwd_mode=0 -login=root -blob_mode=0 +perpage=25 +webmin_subs=0 +mysqlimport=/usr/bin/mysqlimport +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf mysqlshow=/usr/bin/mysqlshow -nodbi=0 -mysqladmin=/usr/bin/mysqladmin -max_dbs=50 -date_subs=0 +passwd_mode=0 mysqldump=/usr/bin/mysqldump add_mode=1 -access=*: * -perpage=25 -start_cmd=service mysql start -webmin_subs=0 +max_dbs=50 +date_subs=0 +mysqladmin=/usr/bin/mysqladmin +style=0 mysql_data=/var/lib/mysql +nodbi=0 max_text=1000 -nopwd=0 -stop_cmd=service mysql stop -mysqlimport=/usr/bin/mysqlimport +blob_mode=0 mysql=/usr/bin/mysql -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -style=0 +stop_cmd=service mysql stop +start_cmd=service mysql start +nopwd=0 mysql_libs=/usr/local/mysql/lib +access=*: * +login=root diff --git a/webmin/net/config b/webmin/net/config index 04c0295d5..56c61c18e 100644 --- a/webmin/net/config +++ b/webmin/net/config @@ -1,2 +1,2 @@ -def_netmask=255.255.255.0 hosts_file=/etc/hosts +def_netmask=255.255.255.0 diff --git a/webmin/nis/config b/webmin/nis/config index cf382fa57..f0960a861 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ -securenets=/etc/ypserv.securenets client_conf=/etc/yp.conf -nsswitch_conf=/etc/nsswitch.conf max_size=100 manual_build=0 +nsswitch_conf=/etc/nsswitch.conf +securenets=/etc/ypserv.securenets diff --git a/webmin/openslp/config b/webmin/openslp/config index 0eeb37ff5..d659ffb88 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd=/usr/sbin/slpd slpd_log=/var/log/slpd.log slpd_conf=/etc/slp.conf -slpd_reg=/etc/slp.reg +slpd=/usr/sbin/slpd slpd_pid=/var/run/slpd.pid +slpd_reg=/etc/slp.reg diff --git a/webmin/pam/config b/webmin/pam/config index 2335d1bf6..b7523fbe0 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -lib_dirs=/lib/security /lib/*/security +mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so pam_dir=/etc/pam.d ignore=README -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 diff --git a/webmin/pap/config b/webmin/pap/config index d1c2d3c04..3f0a388e5 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -dialin_config=/etc/mgetty+sendfax/dialin.config -login_config=/etc/mgetty+sendfax/login.config -mgetty=mgetty -pap_file=/etc/ppp/pap-secrets -serials=/dev/ttyS[0-9]* pppd=pppd encrypt_pass=0 +serials=/dev/ttyS[0-9]* +login_config=/etc/mgetty+sendfax/login.config +mgetty=mgetty +dialin_config=/etc/mgetty+sendfax/dialin.config ppp_options=/etc/ppp/options +pap_file=/etc/ppp/pap-secrets diff --git a/webmin/passwd/config b/webmin/passwd/config index 04110de95..2ab4c6af1 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -max_users=200 input_type=0 sort_mode=0 +max_users=200 diff --git a/webmin/postfix/config b/webmin/postfix/config index 11b2bc79a..dcb5dc1c9 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,28 +1,28 @@ -perpage=20 -mailq_count=0 +postfix_super_command=/usr/sbin/postsuper postfix_queue_command=postqueue -wrap_width=80 -postfix_lookup_table_command=/usr/sbin/postmap -columns=2 delete_warn=1 -postfix_master=/etc/postfix/master.cf -prefix_cmts=0 -sort_mode=0 +mailq_count=0 +top_buttons=1 +postfix_config_command=/usr/sbin/postconf +fwd_mode=0 +delete_confirm=1 postfix_aliases_table_command=/usr/sbin/postalias -postfix_super_command=/usr/sbin/postsuper index_check=1 -fwd_mode=0 -postfix_control_command=/usr/sbin/postfix -top_buttons=1 -postcat_cmd=/usr/sbin/postcat -show_cmts=0 +mailq_sort=0 +ldap_doms=0 +mailq_dir=/var/spool/postfix postfix_config_file=/etc/postfix/main.cf +postfix_lookup_table_command=/usr/sbin/postmap +postfix_master=/etc/postfix/master.cf +show_cmts=0 +perpage=20 postfix_newaliases_command=/usr/bin/newaliases +postcat_cmd=/usr/sbin/postcat max_records=200 -mailq_dir=/var/spool/postfix -delete_confirm=1 -ldap_doms=0 -postfix_config_command=/usr/sbin/postconf -mailq_sort=0 +columns=2 +prefix_cmts=0 +wrap_width=80 +sort_mode=0 +postfix_control_command=/usr/sbin/postfix mailq_cmd=postqueue -p check_config=1 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 90a3b4aed..20298d3a9 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -max_dbs=50 -date_subs=0 -nodbi=0 -blob_mode=0 -login=postgres -rstr_cmd=/usr/bin/pg_restore -perpage=25 -access=*: * basedb=template1 +pid_file=/var/run/postmaster.pid +stop_cmd=/etc/init.d/postgresql* stop +start_cmd=/etc/init.d/postgresql* start +login=postgres simple_sched=0 +access=*: * +nodbi=0 +access_own=0 +blob_mode=0 +max_text=1000 +dump_cmd=/usr/bin/pg_dump +hba_conf=/etc/postgresql/*/main/pg_hba.conf add_mode=1 +date_subs=0 +style=0 +max_dbs=50 +webmin_subs=0 plib= +rstr_cmd=/usr/bin/pg_restore +perpage=25 pass= psql=/usr/bin/psql -pid_file=/var/run/postmaster.pid -stop_cmd=/etc/init.d/postgresql* stop -webmin_subs=0 -access_own=0 -start_cmd=/etc/init.d/postgresql* start -dump_cmd=/usr/bin/pg_dump sameunix=1 -max_text=1000 -style=0 -hba_conf=/etc/postgresql/*/main/pg_hba.conf diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 54849d0a2..e0a3e10a8 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ +file=/etc/wvdial.conf wvdialconf=wvdialconf wvdial=wvdial -file=/etc/wvdial.conf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index eb9c22d12..2c6a01656 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -timeout=30 -pptp=pptp -pptp_options=/etc/ppp/options.pptp pap_file=/etc/ppp/chap-secrets peers_dir=/etc/ppp/peers +timeout=30 +pptp_options=/etc/ppp/options.pptp +pptp=pptp diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index c29c556ff..fc4a6af9e 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -pap_file=/etc/ppp/chap-secrets +log_file=/var/log/messages +start_cmd=/etc/init.d/pptpd start +pptp_ppp_options=/etc/ppp/pptpd-options file=/etc/pptpd.conf -pptpd=pptpd stop_cmd=/etc/init.d/pptpd stop +pptpd=pptpd pid_file=/var/run/pptpd.pid -pptp_ppp_options=/etc/ppp/pptpd-options -start_cmd=/etc/init.d/pptpd start +pap_file=/etc/ppp/chap-secrets ppp_options=/etc/ppp/options -log_file=/var/log/messages diff --git a/webmin/proc/config b/webmin/proc/config index 7f9ae4348..a48444fa6 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -default_mode=last -trace_java=0 +hide_self=1 +ps_style=linux base_ppid=1 cut_length=80 -ps_style=linux -hide_self=1 +default_mode=last +trace_java=0 diff --git a/webmin/procmail/config b/webmin/procmail/config index d5df94749..5b184fd7c 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -includes=0 procmailrc=/etc/procmailrc +includes=0 procmail=procmail diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 4e71caf38..75293d199 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ +proftpd_conf=/etc/proftpd/proftpd.conf +pid_file=/var/run/proftpd.pid test_config=1 +stop_cmd=/etc/init.d/proftpd stop start_cmd=/etc/init.d/proftpd start -ftpusers=/etc/ftpusers -proftpd_conf=/etc/proftpd/proftpd.conf test_manual=0 -test_always=0 -stop_cmd=/etc/init.d/proftpd stop -pid_file=/var/run/proftpd.pid proftpd_path=/usr/sbin/proftpd +ftpusers=/etc/ftpusers +test_always=0 diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 561e9e5f3..88bbc2c1c 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -mailq_sort=0 -mail_system=1 -mail_dir= delete_warn=1 -columns=2 +mailq_count=0 index_min=1000000 -sort_mode=0 +mail_system=1 qmail_dir=/var/qmail +columns=2 max_records=200 -mail_file=Mailbox -mail_dir_qmail=Maildir +mail_dir= perpage=20 +mail_dir_qmail=Maildir fwd_mode=0 -mailq_count=0 +mail_file=Mailbox +mailq_sort=0 +sort_mode=0 diff --git a/webmin/quota/config b/webmin/quota/config index cc6fc7feb..959680641 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -group_quotaon_command=quotaon -g +group_quotaoff_command=quotaoff -g +user_repquota_command=repquota -u -v user_quota_command=quota -v -u +user_quotaoff_command=quotaoff -u group_repquota_command=repquota -g -v -user_repquota_command=repquota -u -v -group_quotaoff_command=quotaoff -g pc_show=1 block_size=1024 -group_grace_command=edquota -g -t -user_setquota_command=setquota -u -sort_mode=0 +group_edquota_command=edquota -g group_setquota_command=setquota -g -user_copy_command=edquota -u -p -block_mode=1 user_grace_command=edquota -u -t -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}. +group_grace_command=edquota -g -t +group_quotaon_command=quotaon -g user_quotaon_command=quotaon -u -quotacheck_command=quotacheck -u -g -show_grace=1 -group_copy_command=edquota -g -p user_edquota_command=edquota -u -group_quota_command=quota -v -g -group_edquota_command=edquota -g hide_uids=0 +group_quota_command=quota -v -g +user_copy_command=edquota -u -p +user_setquota_command=setquota -u display_max=100 +block_mode=1 +group_copy_command=edquota -g -p +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}. +show_grace=1 +sort_mode=0 +quotacheck_command=quotacheck -u -g diff --git a/webmin/raid/config b/webmin/raid/config index 76eb03452..3314566d0 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -mdadm=/etc/mdadm/mdadm.conf raidtab=/etc/raidtab +mdadm=/etc/mdadm/mdadm.conf mdstat=/proc/mdstat diff --git a/webmin/samba/config b/webmin/samba/config index 7f9d65da5..ca1d06467 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -smb_passwd=/etc/samba/smbpasswd -net=/usr/bin/net -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' -swat=/usr/sbin/swat -name_server=/usr/sbin/nmbd pdbedit=/usr/bin/pdbedit -smbgroupedit=/usr/bin/smbgroupedit +restart_cmd=service smbd restart ; service nmbd restart sort_mode=0 +smb_passwd=/etc/samba/smbpasswd +net=/usr/bin/net +samba_status_program=/usr/bin/smbstatus +samba_server=/usr/sbin/smbd dont_convert=-499 +smb_conf=/etc/samba/smb.conf run_from_inetd=0 -restart_cmd=service smbd restart ; service nmbd restart samba_password_program=/usr/bin/smbpasswd stop_cmd=service smbd stop ; service nmbd stop +smbgroupedit=/usr/bin/smbgroupedit +name_server=/usr/sbin/nmbd start_cmd=service smbd start ; service nmbd start -samba_server=/usr/sbin/smbd -samba_status_program=/usr/bin/smbstatus -smb_conf=/etc/samba/smb.conf +swat=/usr/sbin/swat text_lists=0 +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' diff --git a/webmin/sarg/config b/webmin/sarg/config index b9009faeb..75406f229 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -sarg_conf=/etc/sarg/sarg.conf -sarg=sarg naked=0 clear=1 +sarg=sarg +sarg_conf=/etc/sarg/sarg.conf diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 41fa1cce7..fc296c0f3 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ +mail_dir=/var/spool/mail +mail_type=0 +makemap_path=makemap +top_buttons=1 +index_min=1000000 +delete_warn=1 mailq_count=0 -sendmail_features=/usr/share/sendmail/cf -perpage=20 -wrap_width=80 -mail_file=mbox -sendmail_cf=/etc/mail/sendmail.cf -prefix_cmts=0 -sort_mode=0 +mail_style=0 show_to=0 -delete_warn=1 -index_min=1000000 -columns=2 -makemap_path=makemap -track_read=0 -order_mail=0 +mailq_sort=0 +sendmail_command=/usr/lib/sendmail -bd -q1h mailq_show=Date,From,To,Size,Status -show_cmts=0 -top_buttons=1 -fwd_mode=0 delete_confirm=1 -sendmail_command=/usr/lib/sendmail -bd -q1h -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -sendmail_path=/usr/lib/sendmail -max_records=200 +mail_file=mbox +fwd_mode=0 +show_cmts=0 +perpage=20 smrsh_dir=/etc/smrsh +columns=2 +max_records=200 +order_mail=0 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid sendmail_mc=/etc/mail/sendmail.mc -mail_style=0 -mail_type=0 -mail_dir=/var/spool/mail -mailq_sort=0 +track_read=0 +sendmail_path=/usr/lib/sendmail +sort_mode=0 +prefix_cmts=0 +sendmail_cf=/etc/mail/sendmail.cf +sendmail_features=/usr/share/sendmail/cf +wrap_width=80 diff --git a/webmin/servers/config b/webmin/servers/config index b17a5706c..059122be3 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ +display_mode=0 +sort_mode=0 resolve=1 -show_ip=0 show_status=1 -max_servers=100 -scan_time=5 -deffast=2 +capath=/usr/share/ca-certificates deflink=0 -display_mode=0 +deffast=2 +scan_time=5 groups_dir=/etc/cluster/groups -capath=/usr/share/ca-certificates -sort_mode=0 +max_servers=100 +show_ip=0 diff --git a/webmin/shell/config b/webmin/shell/config index 4b3e40b52..044e158ce 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ +clear_envs=0 max_output=100000 max_runtime=86400 -clear_envs=0 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 343105911..fd9e91dba 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -config_dir=/etc/shorewall actions=/etc/shorewall/actions /usr/share/shorewall/actions.std -macros=/usr/share/shorewall display_zone_descriptions=1 +macros=/usr/share/shorewall +config_dir=/etc/shorewall shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index f51cfb550..fda327a1c 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std +shorewall6=shorewall6 config_dir=/etc/shorewall6 macros=/usr/share/shorewall6 -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std display_zone_descriptions=1 -shorewall6=shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index f4c63c585..9d48dc774 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ ata=0 +attribs=1 smartctl=smartctl mode=1 -attribs=1 diff --git a/webmin/software/config b/webmin/software/config index c93f3edb6..9476e6757 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ +apt_mode=0 update_system=apt package_system=debian -apt_mode=0 diff --git a/webmin/spam/config b/webmin/spam/config index ed6f8e8b2..72aa0de5e 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -processes=spamd amavisd -procmail_cmd=* -local_cf=/etc/spamassassin/local.cf -max_awl=200 -call_spam=1 -warn_procmail=1 -mode=0 sa_learn=sa-learn -addto=0 restart_cmd=/etc/init.d/spamassassin restart procmailrc=/etc/procmailrc spamassassin=spamassassin +mode=0 +warn_procmail=1 +processes=spamd amavisd +procmail_cmd=* +max_awl=200 +addto=0 +call_spam=1 +local_cf=/etc/spamassassin/local.cf diff --git a/webmin/squid/config b/webmin/squid/config index 548cd6ddb..ab2c85a76 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -cal_max=50000 -crypt_conf=0 -sort_conf=0 -squid_start=service squid start -pid_file=/var/run/squid.pid -squid_path=squid squid_stop=service squid stop -cal_all=1 +cal_args=-aw +cal_fmt=w cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +squid_conf=/etc/squid/squid.conf +sync_create=0 +sort_conf=0 +calamaris=calamaris +cal_max=50000 +squidclient=squidclient sync_delete=0 +sync_modify=1 +crypt_conf=0 log_dir=/var/log/squid -cal_args=-aw -squidclient=squidclient -calamaris=calamaris -squid_conf=/etc/squid/squid.conf +squid_path=squid +squid_start=service squid start squid_restart=service squid reload -cache_dir=/var/spool/squid -sync_modify=1 -cal_fmt=w -sync_create=0 +cal_all=1 restart_pos=0 +cache_dir=/var/spool/squid +pid_file=/var/run/squid.pid diff --git a/webmin/sshd/config b/webmin/sshd/config index 2397ad873..18a67b9cd 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ sync_pass=0 -client_config=/etc/ssh/ssh_config -keygen_path=/usr/bin/ssh-keygen sync_auth=1 +client_config=/etc/ssh/ssh_config sync_create=0 +keygen_path=/usr/bin/ssh-keygen sshd_config=/etc/ssh/sshd_config start_cmd=service ssh start stop_cmd=service ssh stop -pid_file=/var/run/sshd.pid sshd_path=/usr/sbin/sshd +pid_file=/var/run/sshd.pid sync_gnupg=0 diff --git a/webmin/status/config b/webmin/status/config index 7b7843c80..c30eef794 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ -sysinfo_users=0 -sysinfo=0 +history_show=50 subject_mode=0 -sort_mode=0 columns=2 -snmp_trap=1.3.6.1.4.1.10000.1.1 -history_purge=30 -sched_offset=0 -output=0 -pager_cmd=sms_client -history_show=50 index_status=1 +sysinfo_users=0 +pager_cmd=sms_client +output=0 +sched_offset=0 snmp_version=2 +sort_mode=0 +sysinfo=0 +history_purge=30 +snmp_trap=1.3.6.1.4.1.10000.1.1 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index ae93780b1..0a9a3621e 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -compressed=1 -syslogng_cmd=syslog-ng lines=20 +compressed=1 start_cmd=/etc/init.d/syslog-ng start -syslogng_conf=/etc/syslog-ng/syslog-ng.conf -stop_cmd=/etc/init.d/syslog-ng stop pid_file=/var/run/syslog-ng.pid +stop_cmd=/etc/init.d/syslog-ng stop +syslogng_conf=/etc/syslog-ng/syslog-ng.conf +syslogng_cmd=syslog-ng diff --git a/webmin/syslog/config b/webmin/syslog/config index e8ffd1641..32de9fbaf 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -syslog_conf=/etc/rsyslog.conf -sync=1 +pid_file=/var/run/rsyslogd.pid +others=1 +start_cmd=/usr/sbin/service rsyslog start +compressed=1 +socket=0 +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 -pipe=1 +lines=20 +syslog_conf=/etc/rsyslog.conf +m4_path= m4_conf=0 +pipe=1 +sync=1 syslogd=/usr/sbin/rsyslogd -signal_cmd=/usr/sbin/service rsyslog restart -m4_path= -lines=20 -pri_all=1 -socket=0 +tags=0 pri_dir=1 -pid_file=/var/run/rsyslogd.pid -reverse=0 -start_cmd=/usr/sbin/service rsyslog start +pri_all=1 restart_cmd=/usr/sbin/service rsyslog restart -others=1 -compressed=1 -tags=0 +reverse=0 diff --git a/webmin/system-status/config b/webmin/system-status/config index b6a7e4155..c627a9fec 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_interval=5 collect_pkgs=1 +collect_interval=5 diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index 9539a8514..ddc301405 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ -hosts_deny=/etc/hosts.deny -inetd_services=0 hosts_allow=/etc/hosts.allow +inetd_services=0 +hosts_deny=/etc/hosts.deny diff --git a/webmin/telnet/config b/webmin/telnet/config index 090693df7..2fac6643c 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ +sizemode=0 proxy=0 no_test=0 detach=0 -sizemode=0 mode=1 diff --git a/webmin/time/config b/webmin/time/config index 6d1285b2f..7e2af7f9f 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,5 +1,5 @@ lease=5 seconds=1 -zone_style=linux timeserver_hardware=1 ntp_only=1 +zone_style=linux diff --git a/webmin/updown/config b/webmin/updown/config index 2cae87648..abd9a9718 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -dir=/ ddir=/ -duser=root user=root +duser=root +dir=/ diff --git a/webmin/useradmin/config b/webmin/useradmin/config index 4ae789ff9..33325ad81 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -secmode=0 -gid_calc=0 -default_group=users +lock_string=* from_files=0 -membox=0 -uid_mode=1 -display_max=400 +gshadow_file=/etc/gshadow +extra_real=0 +gid_mode=1 +passwd_same=0 +alias_check=0 passwd_file=/etc/passwd +sort_mode=0 base_uid=1000 +delete_only=0 +membox=0 +delete_root=0 +new_user_group=0 +base_gid=1000 +passwd_progmode=0 +homedir_perms=0755 +skip_md5=0 +display_max=400 +secmode=0 +default_group=users +default_other=1 +random_password=0 +passwd_stars=0 +last_show=0 +md5=1 +group_file=/etc/group +display_mode=1 +uid_mode=1 +empty_mode=0 +uid_calc=0 shells=fixed,passwd,shells passwd_dict=0 +gid_calc=0 selinux_con=user_u:object_r:user_home_dir_t -last_show=0 -gid_mode=1 -user_files=/etc/skel -random_password=0 shadow_file=/etc/shadow -email_type=0 -delete_only=0 -alias_check=0 -lock_string=* -uid_calc=0 -empty_mode=0 -passwd_stars=0 -extra_real=0 new_user_gid=0 -group_file=/etc/group -home_style=0 -md5=1 -new_user_group=0 -default_other=1 -display_mode=1 -passwd_progmode=0 -skip_md5=0 -base_gid=1000 -gshadow_file=/etc/gshadow -delete_root=0 home_base=/home -passwd_same=0 -sort_mode=0 -homedir_perms=0755 +home_style=0 +user_files=/etc/skel +email_type=0 diff --git a/webmin/usermin/config b/webmin/usermin/config index b01f02d93..47e002a21 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -update=0 -updays=1 -usermin_dir=/etc/usermin uphour=4 -upshow=1 -upmissing=0 +updays=1 +update=0 cron_mode=0 +upmissing=0 +upshow=1 +usermin_dir=/etc/usermin diff --git a/webmin/version b/webmin/version index dda46a367..1a26c46fd 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.920 +1.930 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 7ad21a96b..cf43b9406 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ webalizer_conf=/etc/webalizer/webalizer.conf +auto=apache,squid,proftpd,wuftpd +naked=0 webalizer=/usr/bin/webalizer -skip_old=0 alt_conf=/etc/webalizer/webalizer.conf.sample -naked=0 -auto=apache,squid,proftpd,wuftpd +skip_old=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index b0d87d1b3..24873d8ee 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,11 +1,11 @@ -warn_days=7 +upshow=1 upmissing=0 upmins=47 -last_version_check=1549050668 -osdn=1 cron_mode=0 -uphour=23 -upshow=1 updays=1 last_version_number=1.900 +osdn=1 +last_version_check=1549050668 +uphour=23 update=0 +warn_days=7 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 3ae6748b3..8d537a05c 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpaccess=/etc/wu-ftpd/ftpaccess -ftphosts=/etc/wu-ftpd/ftphosts -log_file=/var/log/xferlog ftpconversions=/etc/wu-ftpd/ftpconversions pid_file=/var/run/ftpd.pids-all -ftpusers=/etc/wu-ftpd/ftpusers -ftpd_path=/usr/sbin/wu-ftpd +log_file=/var/log/xferlog +ftpaccess=/etc/wu-ftpd/ftpaccess ftpgroups=/etc/wu-ftpd/ftpgroups +ftphosts=/etc/wu-ftpd/ftphosts +ftpd_path=/usr/sbin/wu-ftpd +ftpusers=/etc/wu-ftpd/ftpusers diff --git a/webmin/xinetd/config b/webmin/xinetd/config index c388770ef..1ded43714 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -start_cmd=/etc/init.d/xinetd start +xinetd_conf=/etc/xinetd.conf lookup_servs=1 +start_cmd=/etc/init.d/xinetd start pid_file=/var/run/xinetd.pid -xinetd_conf=/etc/xinetd.conf protocols_file=/etc/protocols -- 2.43.0