From af868656eaf81b9f7a2d885dd27dd504ad1b7aaf Mon Sep 17 00:00:00 2001 From: iliajie Date: Wed, 20 Jul 2022 03:39:23 +0300 Subject: [PATCH] Fix more modules config files --- apache/config-AlmaLinux-7.0-ALL | 2 +- ...x-20-ALL => config-Fedora-Linux-20.00-ALL} | 6 ++--- apache/config-Rocky-Linux-7.0-ALL | 2 +- apache/config-debian-linux-10.0-ALL | 23 ++++++++++++++++ ...ux-7.0-ALL => config-debian-linux-7.0-9.0} | 2 +- apache/config-redhat-linux-24.0-ALL | 5 ++-- dovecot/config-redhat-linux-24.0-ALL | 2 +- mysql/config-AlmaLinux-7.0-ALL | 5 ++-- mysql/config-CentOS-Linux-7.0-ALL | 5 ++-- mysql/config-Redhat-Enterprise-Linux-7.0-ALL | 5 ++-- mysql/config-Rocky-Linux-7.0-ALL | 5 ++-- mysql/config-Ubuntu-Linux-18.04-ALL | 6 ++--- mysql/config-debian-linux-10.0-ALL | 23 ++++++++++++++++ ...ux-2.2-ALL => config-debian-linux-2.2-9.0} | 0 mysql/config-redhat-linux-25.0-ALL | 5 ++-- postgresql/config-AlmaLinux-7.0-ALL | 4 +-- postgresql/config-CentOS-Linux-7.0-ALL | 4 +-- postgresql/config-Rocky-Linux-7.0-ALL | 4 +-- postgresql/config-debian-linux-10.0-ALL | 24 +++++++++++++++++ ...ux-4.0-ALL => config-debian-linux-4.0-9.0} | 0 proftpd/config-AlmaLinux-7.0-ALL | 1 + proftpd/config-CentOS-Linux-7.0-ALL | 1 + proftpd/config-Rocky-Linux-7.0-ALL | 1 + proftpd/config-Ubuntu-Linux | 4 +-- proftpd/config-debian-linux-10.0-ALL | 9 +++++++ ...ux-4.0-ALL => config-debian-linux-4.0-9.0} | 0 proftpd/config-redhat-linux-24.0-ALL | 1 + spam/config-AlmaLinux-7.0-ALL | 13 ++++++++++ spam/config-Rocky-Linux-7.0-ALL | 13 ++++++++++ spam/config-debian-linux-10.0-ALL | 13 ++++++++++ spam/config-redhat-linux-24.0-ALL | 13 ++++++++++ squid/config-AlmaLinux-7.0-ALL | 5 ++-- squid/config-Redhat-Enterprise-Linux-7.0-ALL | 5 ++-- squid/config-Rocky-Linux-7.0-ALL | 5 ++-- squid/config-Ubuntu-Linux-16.0-ALL | 6 ++--- squid/config-debian-linux-10.0-ALL | 21 +++++++++++++++ ...ux-7.0-ALL => config-debian-linux-7.0-9.0} | 0 squid/config-redhat-linux-24.0-ALL | 7 ++--- sshd/config-AlmaLinux-8.0-ALL | 11 ++++++++ sshd/config-Rocky-Linux-8.0-ALL | 11 ++++++++ sshd/config-debian-linux-10.0-ALL | 11 ++++++++ ...ux-2.2-ALL => config-debian-linux-2.2-9.0} | 0 syslog/config-AlmaLinux-6.0-ALL | 7 ++--- syslog/config-Redhat-Enterprise-Linux-6.0-ALL | 7 ++--- syslog/config-Rocky-Linux-6.0-ALL | 7 ++--- syslog/config-Ubuntu-Linux-10.04-ALL | 6 ++--- ...ux-5.0-ALL => config-debian-linux-5.0-9.0} | 0 syslog/config-debian-linux-9.0-ALL | 19 ++++++++++++++ syslog/config-redhat-linux-24.0-ALL | 6 +++-- syslog/config-redhat-linux-ALL-15.0 | 26 ------------------- 50 files changed, 279 insertions(+), 82 deletions(-) rename apache/{config-Fedora-Linux-20-ALL => config-Fedora-Linux-20.00-ALL} (79%) create mode 100644 apache/config-debian-linux-10.0-ALL rename apache/{config-debian-linux-7.0-ALL => config-debian-linux-7.0-9.0} (98%) create mode 100644 mysql/config-debian-linux-10.0-ALL rename mysql/{config-debian-linux-2.2-ALL => config-debian-linux-2.2-9.0} (100%) create mode 100644 postgresql/config-debian-linux-10.0-ALL rename postgresql/{config-debian-linux-4.0-ALL => config-debian-linux-4.0-9.0} (100%) create mode 100644 proftpd/config-debian-linux-10.0-ALL rename proftpd/{config-debian-linux-4.0-ALL => config-debian-linux-4.0-9.0} (100%) create mode 100644 spam/config-AlmaLinux-7.0-ALL create mode 100644 spam/config-Rocky-Linux-7.0-ALL create mode 100644 spam/config-debian-linux-10.0-ALL create mode 100644 spam/config-redhat-linux-24.0-ALL create mode 100644 squid/config-debian-linux-10.0-ALL rename squid/{config-debian-linux-7.0-ALL => config-debian-linux-7.0-9.0} (100%) create mode 100644 sshd/config-AlmaLinux-8.0-ALL create mode 100644 sshd/config-Rocky-Linux-8.0-ALL create mode 100644 sshd/config-debian-linux-10.0-ALL rename sshd/{config-debian-linux-2.2-ALL => config-debian-linux-2.2-9.0} (100%) rename syslog/{config-debian-linux-5.0-ALL => config-debian-linux-5.0-9.0} (100%) create mode 100644 syslog/config-debian-linux-9.0-ALL delete mode 100644 syslog/config-redhat-linux-ALL-15.0 diff --git a/apache/config-AlmaLinux-7.0-ALL b/apache/config-AlmaLinux-7.0-ALL index f647b84af..88d779980 100644 --- a/apache/config-AlmaLinux-7.0-ALL +++ b/apache/config-AlmaLinux-7.0-ALL @@ -1,4 +1,4 @@ -show_list=0 +show_list=1 httpd_dir=/etc/httpd httpd_path=/usr/sbin/httpd mime_types=/etc/mime.types diff --git a/apache/config-Fedora-Linux-20-ALL b/apache/config-Fedora-Linux-20.00-ALL similarity index 79% rename from apache/config-Fedora-Linux-20-ALL rename to apache/config-Fedora-Linux-20.00-ALL index a29ba2391..88d779980 100644 --- a/apache/config-Fedora-Linux-20-ALL +++ b/apache/config-Fedora-Linux-20.00-ALL @@ -1,9 +1,9 @@ -show_list=0 +show_list=1 httpd_dir=/etc/httpd httpd_path=/usr/sbin/httpd mime_types=/etc/mime.types start_cmd=systemctl start httpd.service -apply_cmd=/usr/sbin/apachectl graceful +apply_cmd=systemctl reload httpd.service stop_cmd=systemctl stop httpd.service show_order=0 max_servers=100 @@ -15,5 +15,5 @@ test_apachectl=1 auto_mods=1 show_names=0 allow_virtualmin=0 -pid_file=/etc/httpd/run/httpd.pid +pid_file=/run/httpd/httpd.pid format_config=1 diff --git a/apache/config-Rocky-Linux-7.0-ALL b/apache/config-Rocky-Linux-7.0-ALL index f647b84af..88d779980 100644 --- a/apache/config-Rocky-Linux-7.0-ALL +++ b/apache/config-Rocky-Linux-7.0-ALL @@ -1,4 +1,4 @@ -show_list=0 +show_list=1 httpd_dir=/etc/httpd httpd_path=/usr/sbin/httpd mime_types=/etc/mime.types diff --git a/apache/config-debian-linux-10.0-ALL b/apache/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..9754f2e3e --- /dev/null +++ b/apache/config-debian-linux-10.0-ALL @@ -0,0 +1,23 @@ +show_list=1 +httpd_dir=/etc/apache2 +httpd_path=/usr/sbin/apache2 +httpd_conf=/etc/apache2/apache2.conf +mime_types=/etc/mime.types +start_cmd=systemctl start apache2 +apply_cmd=systemctl reload apache2 +stop_cmd=systemctl stop apache2 +show_order=0 +max_servers=100 +test_config=1 +test_manual=0 +test_always=0 +test_apachectl=1 +virt_file=/etc/apache2/sites-available +link_dir=/etc/apache2/sites-enabled +auto_mods=1 +defines_file=/etc/apache2/envvars +defines_name=APACHE_ARGUMENTS +apachectl_path=/usr/sbin/apache2ctl +show_names=0 +allow_virtualmin=0 +format_config=1 diff --git a/apache/config-debian-linux-7.0-ALL b/apache/config-debian-linux-7.0-9.0 similarity index 98% rename from apache/config-debian-linux-7.0-ALL rename to apache/config-debian-linux-7.0-9.0 index 498332368..a06a5b664 100644 --- a/apache/config-debian-linux-7.0-ALL +++ b/apache/config-debian-linux-7.0-9.0 @@ -1,4 +1,4 @@ -show_list=0 +show_list=1 httpd_dir=/etc/apache2 httpd_path=/usr/sbin/apache2 httpd_conf=/etc/apache2/apache2.conf diff --git a/apache/config-redhat-linux-24.0-ALL b/apache/config-redhat-linux-24.0-ALL index f0903bafe..88d779980 100644 --- a/apache/config-redhat-linux-24.0-ALL +++ b/apache/config-redhat-linux-24.0-ALL @@ -1,9 +1,9 @@ -show_list=0 +show_list=1 httpd_dir=/etc/httpd httpd_path=/usr/sbin/httpd mime_types=/etc/mime.types start_cmd=systemctl start httpd.service -apply_cmd=/usr/sbin/apachectl graceful +apply_cmd=systemctl reload httpd.service stop_cmd=systemctl stop httpd.service show_order=0 max_servers=100 @@ -15,4 +15,5 @@ test_apachectl=1 auto_mods=1 show_names=0 allow_virtualmin=0 +pid_file=/run/httpd/httpd.pid format_config=1 diff --git a/dovecot/config-redhat-linux-24.0-ALL b/dovecot/config-redhat-linux-24.0-ALL index 49f4797f0..ea6da2d63 100644 --- a/dovecot/config-redhat-linux-24.0-ALL +++ b/dovecot/config-redhat-linux-24.0-ALL @@ -1,4 +1,4 @@ dovecot=/usr/sbin/dovecot dovecot_config=/etc/dovecot/dovecot.conf /etc/dovecot.conf init_script=dovecot.service -pid_file=/var/run/dovecot/master.pid +pid_file=/run/dovecot/master.pid diff --git a/mysql/config-AlmaLinux-7.0-ALL b/mysql/config-AlmaLinux-7.0-ALL index 3b3abc25f..178db10ea 100644 --- a/mysql/config-AlmaLinux-7.0-ALL +++ b/mysql/config-AlmaLinux-7.0-ALL @@ -1,5 +1,5 @@ -start_cmd=service mariadb start -stop_cmd=service mariadb stop +start_cmd=systemctl start mariadb +stop_cmd=systemctl stop mariadb mysql=/usr/bin/mysql mysqldump=/usr/bin/mysqldump mysqlimport=/usr/bin/mysqlimport @@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf max_text=1000 nopwd=0 webmin_subs=0 +login=root \ No newline at end of file diff --git a/mysql/config-CentOS-Linux-7.0-ALL b/mysql/config-CentOS-Linux-7.0-ALL index 3b3abc25f..178db10ea 100644 --- a/mysql/config-CentOS-Linux-7.0-ALL +++ b/mysql/config-CentOS-Linux-7.0-ALL @@ -1,5 +1,5 @@ -start_cmd=service mariadb start -stop_cmd=service mariadb stop +start_cmd=systemctl start mariadb +stop_cmd=systemctl stop mariadb mysql=/usr/bin/mysql mysqldump=/usr/bin/mysqldump mysqlimport=/usr/bin/mysqlimport @@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf max_text=1000 nopwd=0 webmin_subs=0 +login=root \ No newline at end of file diff --git a/mysql/config-Redhat-Enterprise-Linux-7.0-ALL b/mysql/config-Redhat-Enterprise-Linux-7.0-ALL index 3b3abc25f..178db10ea 100644 --- a/mysql/config-Redhat-Enterprise-Linux-7.0-ALL +++ b/mysql/config-Redhat-Enterprise-Linux-7.0-ALL @@ -1,5 +1,5 @@ -start_cmd=service mariadb start -stop_cmd=service mariadb stop +start_cmd=systemctl start mariadb +stop_cmd=systemctl stop mariadb mysql=/usr/bin/mysql mysqldump=/usr/bin/mysqldump mysqlimport=/usr/bin/mysqlimport @@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf max_text=1000 nopwd=0 webmin_subs=0 +login=root \ No newline at end of file diff --git a/mysql/config-Rocky-Linux-7.0-ALL b/mysql/config-Rocky-Linux-7.0-ALL index 3b3abc25f..178db10ea 100644 --- a/mysql/config-Rocky-Linux-7.0-ALL +++ b/mysql/config-Rocky-Linux-7.0-ALL @@ -1,5 +1,5 @@ -start_cmd=service mariadb start -stop_cmd=service mariadb stop +start_cmd=systemctl start mariadb +stop_cmd=systemctl stop mariadb mysql=/usr/bin/mysql mysqldump=/usr/bin/mysqldump mysqlimport=/usr/bin/mysqlimport @@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf max_text=1000 nopwd=0 webmin_subs=0 +login=root \ No newline at end of file diff --git a/mysql/config-Ubuntu-Linux-18.04-ALL b/mysql/config-Ubuntu-Linux-18.04-ALL index 21a606aa8..06a7efb00 100644 --- a/mysql/config-Ubuntu-Linux-18.04-ALL +++ b/mysql/config-Ubuntu-Linux-18.04-ALL @@ -1,9 +1,9 @@ -start_cmd=service mysql start -stop_cmd=service mysql stop +start_cmd=systemctl start mysql +stop_cmd=systemctl stop mysql mysql=/usr/bin/mysql mysqldump=/usr/bin/mysqldump mysqlimport=/usr/bin/mysqlimport -mysql_libs=/usr/local/mysql/lib +mysql_libs= mysqladmin=/usr/bin/mysqladmin mysqlshow=/usr/bin/mysqlshow perpage=25 diff --git a/mysql/config-debian-linux-10.0-ALL b/mysql/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..06a7efb00 --- /dev/null +++ b/mysql/config-debian-linux-10.0-ALL @@ -0,0 +1,23 @@ +start_cmd=systemctl start mysql +stop_cmd=systemctl stop mysql +mysql=/usr/bin/mysql +mysqldump=/usr/bin/mysqldump +mysqlimport=/usr/bin/mysqlimport +mysql_libs= +mysqladmin=/usr/bin/mysqladmin +mysqlshow=/usr/bin/mysqlshow +perpage=25 +style=1 +add_mode=1 +nodbi=0 +access=*: * +blob_mode=0 +date_subs=0 +passwd_mode=0 +mysql_data=/var/lib/mysql +max_dbs=50 +my_cnf=/etc/mysql/my.cnf +max_text=1000 +nopwd=0 +webmin_subs=0 +login=root diff --git a/mysql/config-debian-linux-2.2-ALL b/mysql/config-debian-linux-2.2-9.0 similarity index 100% rename from mysql/config-debian-linux-2.2-ALL rename to mysql/config-debian-linux-2.2-9.0 diff --git a/mysql/config-redhat-linux-25.0-ALL b/mysql/config-redhat-linux-25.0-ALL index a6459479c..178db10ea 100644 --- a/mysql/config-redhat-linux-25.0-ALL +++ b/mysql/config-redhat-linux-25.0-ALL @@ -1,5 +1,5 @@ -start_cmd=systemctl start mariadb.service -stop_cmd=systemctl stop mariadb.service +start_cmd=systemctl start mariadb +stop_cmd=systemctl stop mariadb mysql=/usr/bin/mysql mysqldump=/usr/bin/mysqldump mysqlimport=/usr/bin/mysqlimport @@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf max_text=1000 nopwd=0 webmin_subs=0 +login=root \ No newline at end of file diff --git a/postgresql/config-AlmaLinux-7.0-ALL b/postgresql/config-AlmaLinux-7.0-ALL index 0303cb1f5..c1c0f9a09 100644 --- a/postgresql/config-AlmaLinux-7.0-ALL +++ b/postgresql/config-AlmaLinux-7.0-ALL @@ -3,12 +3,12 @@ psql=/usr/bin/psql basedb=template1 start_cmd=systemctl start postgresql stop_cmd=systemctl stop postgresql -pid_file=/var/run/postmaster*.pid +pid_file=/var/lib/pgsql/data/postmaster.pid perpage=25 hba_conf=/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/*/data/pg_hba.conf nodbi=0 user=postgres -setup_cmd=postgresql-setup initdb +setup_cmd=postgresql-setup --initdb dump_cmd=/usr/bin/pg_dump rstr_cmd=/usr/bin/pg_restore repository=/home/db_repository diff --git a/postgresql/config-CentOS-Linux-7.0-ALL b/postgresql/config-CentOS-Linux-7.0-ALL index 0303cb1f5..c1c0f9a09 100644 --- a/postgresql/config-CentOS-Linux-7.0-ALL +++ b/postgresql/config-CentOS-Linux-7.0-ALL @@ -3,12 +3,12 @@ psql=/usr/bin/psql basedb=template1 start_cmd=systemctl start postgresql stop_cmd=systemctl stop postgresql -pid_file=/var/run/postmaster*.pid +pid_file=/var/lib/pgsql/data/postmaster.pid perpage=25 hba_conf=/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/*/data/pg_hba.conf nodbi=0 user=postgres -setup_cmd=postgresql-setup initdb +setup_cmd=postgresql-setup --initdb dump_cmd=/usr/bin/pg_dump rstr_cmd=/usr/bin/pg_restore repository=/home/db_repository diff --git a/postgresql/config-Rocky-Linux-7.0-ALL b/postgresql/config-Rocky-Linux-7.0-ALL index 0303cb1f5..c1c0f9a09 100644 --- a/postgresql/config-Rocky-Linux-7.0-ALL +++ b/postgresql/config-Rocky-Linux-7.0-ALL @@ -3,12 +3,12 @@ psql=/usr/bin/psql basedb=template1 start_cmd=systemctl start postgresql stop_cmd=systemctl stop postgresql -pid_file=/var/run/postmaster*.pid +pid_file=/var/lib/pgsql/data/postmaster.pid perpage=25 hba_conf=/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/*/data/pg_hba.conf nodbi=0 user=postgres -setup_cmd=postgresql-setup initdb +setup_cmd=postgresql-setup --initdb dump_cmd=/usr/bin/pg_dump rstr_cmd=/usr/bin/pg_restore repository=/home/db_repository diff --git a/postgresql/config-debian-linux-10.0-ALL b/postgresql/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..94d6626e8 --- /dev/null +++ b/postgresql/config-debian-linux-10.0-ALL @@ -0,0 +1,24 @@ +hba_conf=/etc/postgresql/*/main/pg_hba.conf +psql=/usr/bin/psql +start_cmd=systemctl start postgresql +stop_cmd=systemctl stop postgresql +basedb=template1 +perpage=25 +plib= +pass= +login=postgres +pid_file=/run/postgresql/*.pid +nodbi=0 +dump_cmd=/usr/bin/pg_dump +rstr_cmd=/usr/bin/pg_restore +sameunix=1 +access=*: * +blob_mode=0 +add_mode=1 +date_subs=0 +style=0 +max_dbs=50 +simple_sched=0 +access_own=0 +max_text=1000 +webmin_subs=0 diff --git a/postgresql/config-debian-linux-4.0-ALL b/postgresql/config-debian-linux-4.0-9.0 similarity index 100% rename from postgresql/config-debian-linux-4.0-ALL rename to postgresql/config-debian-linux-4.0-9.0 diff --git a/proftpd/config-AlmaLinux-7.0-ALL b/proftpd/config-AlmaLinux-7.0-ALL index 634b33a07..0a3e0ac8e 100644 --- a/proftpd/config-AlmaLinux-7.0-ALL +++ b/proftpd/config-AlmaLinux-7.0-ALL @@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd start_cmd=systemctl start proftpd defines_file=/etc/sysconfig/proftpd defines_name=PROFTPD_OPTIONS +pid_file=/run/proftpd/proftpd.pid diff --git a/proftpd/config-CentOS-Linux-7.0-ALL b/proftpd/config-CentOS-Linux-7.0-ALL index 634b33a07..0a3e0ac8e 100644 --- a/proftpd/config-CentOS-Linux-7.0-ALL +++ b/proftpd/config-CentOS-Linux-7.0-ALL @@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd start_cmd=systemctl start proftpd defines_file=/etc/sysconfig/proftpd defines_name=PROFTPD_OPTIONS +pid_file=/run/proftpd/proftpd.pid diff --git a/proftpd/config-Rocky-Linux-7.0-ALL b/proftpd/config-Rocky-Linux-7.0-ALL index 634b33a07..0a3e0ac8e 100644 --- a/proftpd/config-Rocky-Linux-7.0-ALL +++ b/proftpd/config-Rocky-Linux-7.0-ALL @@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd start_cmd=systemctl start proftpd defines_file=/etc/sysconfig/proftpd defines_name=PROFTPD_OPTIONS +pid_file=/run/proftpd/proftpd.pid diff --git a/proftpd/config-Ubuntu-Linux b/proftpd/config-Ubuntu-Linux index 021ac0d5c..669083a93 100644 --- a/proftpd/config-Ubuntu-Linux +++ b/proftpd/config-Ubuntu-Linux @@ -1,8 +1,8 @@ proftpd_path=/usr/sbin/proftpd proftpd_conf=/etc/proftpd/proftpd.conf pid_file=/var/run/proftpd.pid -start_cmd=/etc/init.d/proftpd start -stop_cmd=/etc/init.d/proftpd stop +start_cmd=systemctl start proftpd +stop_cmd=systemctl stop proftpd ftpusers=/etc/ftpusers test_config=1 test_always=0 diff --git a/proftpd/config-debian-linux-10.0-ALL b/proftpd/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..669083a93 --- /dev/null +++ b/proftpd/config-debian-linux-10.0-ALL @@ -0,0 +1,9 @@ +proftpd_path=/usr/sbin/proftpd +proftpd_conf=/etc/proftpd/proftpd.conf +pid_file=/var/run/proftpd.pid +start_cmd=systemctl start proftpd +stop_cmd=systemctl stop proftpd +ftpusers=/etc/ftpusers +test_config=1 +test_always=0 +test_manual=0 diff --git a/proftpd/config-debian-linux-4.0-ALL b/proftpd/config-debian-linux-4.0-9.0 similarity index 100% rename from proftpd/config-debian-linux-4.0-ALL rename to proftpd/config-debian-linux-4.0-9.0 diff --git a/proftpd/config-redhat-linux-24.0-ALL b/proftpd/config-redhat-linux-24.0-ALL index 1d006137d..c62b475ad 100644 --- a/proftpd/config-redhat-linux-24.0-ALL +++ b/proftpd/config-redhat-linux-24.0-ALL @@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd.service start_cmd=systemctl start proftpd.service defines_file=/etc/sysconfig/proftpd defines_name=PROFTPD_OPTIONS +pid_file=/run/proftpd/proftpd.pid diff --git a/spam/config-AlmaLinux-7.0-ALL b/spam/config-AlmaLinux-7.0-ALL new file mode 100644 index 000000000..79c314a7f --- /dev/null +++ b/spam/config-AlmaLinux-7.0-ALL @@ -0,0 +1,13 @@ +local_cf=/etc/mail/spamassassin/local.cf +spamassassin=spamassassin +sa_learn=sa-learn +procmailrc=/etc/procmailrc +amavisdconf=/etc/amavisd/amavisd.conf +warn_procmail=1 +call_spam=1 +processes=spamd amavisd +restart_cmd=systemctl restart spamassassin +procmail_cmd=* +mode=0 +addto=0 +max_awl=200 diff --git a/spam/config-Rocky-Linux-7.0-ALL b/spam/config-Rocky-Linux-7.0-ALL new file mode 100644 index 000000000..79c314a7f --- /dev/null +++ b/spam/config-Rocky-Linux-7.0-ALL @@ -0,0 +1,13 @@ +local_cf=/etc/mail/spamassassin/local.cf +spamassassin=spamassassin +sa_learn=sa-learn +procmailrc=/etc/procmailrc +amavisdconf=/etc/amavisd/amavisd.conf +warn_procmail=1 +call_spam=1 +processes=spamd amavisd +restart_cmd=systemctl restart spamassassin +procmail_cmd=* +mode=0 +addto=0 +max_awl=200 diff --git a/spam/config-debian-linux-10.0-ALL b/spam/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..1b788fde4 --- /dev/null +++ b/spam/config-debian-linux-10.0-ALL @@ -0,0 +1,13 @@ +local_cf=/etc/spamassassin/local.cf +spamassassin=spamassassin +sa_learn=sa-learn +procmailrc=/etc/procmailrc +amavisdconf=/etc/amavis/conf.d/20-debian_defaults +warn_procmail=1 +call_spam=1 +processes=spamd amavisd +restart_cmd=systemctl restart spamassassin +procmail_cmd=* +mode=0 +addto=0 +max_awl=200 diff --git a/spam/config-redhat-linux-24.0-ALL b/spam/config-redhat-linux-24.0-ALL new file mode 100644 index 000000000..79c314a7f --- /dev/null +++ b/spam/config-redhat-linux-24.0-ALL @@ -0,0 +1,13 @@ +local_cf=/etc/mail/spamassassin/local.cf +spamassassin=spamassassin +sa_learn=sa-learn +procmailrc=/etc/procmailrc +amavisdconf=/etc/amavisd/amavisd.conf +warn_procmail=1 +call_spam=1 +processes=spamd amavisd +restart_cmd=systemctl restart spamassassin +procmail_cmd=* +mode=0 +addto=0 +max_awl=200 diff --git a/squid/config-AlmaLinux-7.0-ALL b/squid/config-AlmaLinux-7.0-ALL index 28ee8fd27..598e82dcb 100644 --- a/squid/config-AlmaLinux-7.0-ALL +++ b/squid/config-AlmaLinux-7.0-ALL @@ -4,8 +4,9 @@ cache_dir=/var/spool/squid squid_conf=/etc/squid/squid.conf pid_file=/run/squid.pid cachemgr_path=/usr/*/squid/cachemgr.cgi -squid_start=service squid start -squid_stop=service squid stop +squid_start=systemctl start squid +squid_stop=systemctl stop squid +squid_restart=systemctl reload squid calamaris=calamaris cal_max=50000 cal_args=-aw diff --git a/squid/config-Redhat-Enterprise-Linux-7.0-ALL b/squid/config-Redhat-Enterprise-Linux-7.0-ALL index 28ee8fd27..598e82dcb 100644 --- a/squid/config-Redhat-Enterprise-Linux-7.0-ALL +++ b/squid/config-Redhat-Enterprise-Linux-7.0-ALL @@ -4,8 +4,9 @@ cache_dir=/var/spool/squid squid_conf=/etc/squid/squid.conf pid_file=/run/squid.pid cachemgr_path=/usr/*/squid/cachemgr.cgi -squid_start=service squid start -squid_stop=service squid stop +squid_start=systemctl start squid +squid_stop=systemctl stop squid +squid_restart=systemctl reload squid calamaris=calamaris cal_max=50000 cal_args=-aw diff --git a/squid/config-Rocky-Linux-7.0-ALL b/squid/config-Rocky-Linux-7.0-ALL index 28ee8fd27..598e82dcb 100644 --- a/squid/config-Rocky-Linux-7.0-ALL +++ b/squid/config-Rocky-Linux-7.0-ALL @@ -4,8 +4,9 @@ cache_dir=/var/spool/squid squid_conf=/etc/squid/squid.conf pid_file=/run/squid.pid cachemgr_path=/usr/*/squid/cachemgr.cgi -squid_start=service squid start -squid_stop=service squid stop +squid_start=systemctl start squid +squid_stop=systemctl stop squid +squid_restart=systemctl reload squid calamaris=calamaris cal_max=50000 cal_args=-aw diff --git a/squid/config-Ubuntu-Linux-16.0-ALL b/squid/config-Ubuntu-Linux-16.0-ALL index efb717748..3ae5dc74d 100644 --- a/squid/config-Ubuntu-Linux-16.0-ALL +++ b/squid/config-Ubuntu-Linux-16.0-ALL @@ -16,6 +16,6 @@ cal_fmt=w cal_all=1 restart_pos=0 squidclient=squidclient -squid_start=service squid start -squid_stop=service squid stop -squid_restart=service squid reload +squid_start=systemctl start squid +squid_stop=systemctl stop squid +squid_restart=systemctl reload squid diff --git a/squid/config-debian-linux-10.0-ALL b/squid/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..3ae5dc74d --- /dev/null +++ b/squid/config-debian-linux-10.0-ALL @@ -0,0 +1,21 @@ +log_dir=/var/log/squid +squid_path=squid +cache_dir=/var/spool/squid +squid_conf=/etc/squid/squid.conf +pid_file=/var/run/squid.pid +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +calamaris=calamaris +cal_max=50000 +cal_args=-aw +crypt_conf=0 +sort_conf=0 +sync_create=0 +sync_delete=0 +sync_modify=1 +cal_fmt=w +cal_all=1 +restart_pos=0 +squidclient=squidclient +squid_start=systemctl start squid +squid_stop=systemctl stop squid +squid_restart=systemctl reload squid diff --git a/squid/config-debian-linux-7.0-ALL b/squid/config-debian-linux-7.0-9.0 similarity index 100% rename from squid/config-debian-linux-7.0-ALL rename to squid/config-debian-linux-7.0-9.0 diff --git a/squid/config-redhat-linux-24.0-ALL b/squid/config-redhat-linux-24.0-ALL index e17a5f396..598e82dcb 100644 --- a/squid/config-redhat-linux-24.0-ALL +++ b/squid/config-redhat-linux-24.0-ALL @@ -2,10 +2,11 @@ log_dir=/var/log/squid squid_path=squid cache_dir=/var/spool/squid squid_conf=/etc/squid/squid.conf -pid_file=/var/run/squid.pid +pid_file=/run/squid.pid cachemgr_path=/usr/*/squid/cachemgr.cgi -squid_start=systemctl start squid.service -squid_stop=systemctl stop squid.service +squid_start=systemctl start squid +squid_stop=systemctl stop squid +squid_restart=systemctl reload squid calamaris=calamaris cal_max=50000 cal_args=-aw diff --git a/sshd/config-AlmaLinux-8.0-ALL b/sshd/config-AlmaLinux-8.0-ALL new file mode 100644 index 000000000..1f065023a --- /dev/null +++ b/sshd/config-AlmaLinux-8.0-ALL @@ -0,0 +1,11 @@ +sshd_path=/usr/sbin/sshd +sshd_config=/etc/ssh/sshd_config +client_config=/etc/ssh/ssh_config +pid_file=/var/run/sshd.pid +start_cmd=systemctl start sshd +stop_cmd=systemctl stop sshd +keygen_path=/usr/bin/ssh-keygen +sync_create=0 +sync_auth=1 +sync_pass=0 +sync_gnupg=0 diff --git a/sshd/config-Rocky-Linux-8.0-ALL b/sshd/config-Rocky-Linux-8.0-ALL new file mode 100644 index 000000000..1f065023a --- /dev/null +++ b/sshd/config-Rocky-Linux-8.0-ALL @@ -0,0 +1,11 @@ +sshd_path=/usr/sbin/sshd +sshd_config=/etc/ssh/sshd_config +client_config=/etc/ssh/ssh_config +pid_file=/var/run/sshd.pid +start_cmd=systemctl start sshd +stop_cmd=systemctl stop sshd +keygen_path=/usr/bin/ssh-keygen +sync_create=0 +sync_auth=1 +sync_pass=0 +sync_gnupg=0 diff --git a/sshd/config-debian-linux-10.0-ALL b/sshd/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..1f065023a --- /dev/null +++ b/sshd/config-debian-linux-10.0-ALL @@ -0,0 +1,11 @@ +sshd_path=/usr/sbin/sshd +sshd_config=/etc/ssh/sshd_config +client_config=/etc/ssh/ssh_config +pid_file=/var/run/sshd.pid +start_cmd=systemctl start sshd +stop_cmd=systemctl stop sshd +keygen_path=/usr/bin/ssh-keygen +sync_create=0 +sync_auth=1 +sync_pass=0 +sync_gnupg=0 diff --git a/sshd/config-debian-linux-2.2-ALL b/sshd/config-debian-linux-2.2-9.0 similarity index 100% rename from sshd/config-debian-linux-2.2-ALL rename to sshd/config-debian-linux-2.2-9.0 diff --git a/syslog/config-AlmaLinux-6.0-ALL b/syslog/config-AlmaLinux-6.0-ALL index a6567ef0a..97abbd49c 100644 --- a/syslog/config-AlmaLinux-6.0-ALL +++ b/syslog/config-AlmaLinux-6.0-ALL @@ -3,7 +3,7 @@ syslogd=/sbin/rsyslogd m4_conf=0 syslog_conf=/etc/rsyslog.conf pri_dir=1 -pid_file=/var/run/rsyslogd.pid /run/syslogd.pid +pid_file=/run/rsyslogd.pid facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 m4_path= sync=1 @@ -19,8 +19,9 @@ file_/var/log/news.crit=desc_news file_/var/log/news.err=desc_news file_/var/log/news.notice=desc_news socket=0 -start_cmd=service rsyslog start -restart_cmd=service rsyslog restart +start_cmd=systemctl start rsyslog +restart_cmd=systemctl restart rsyslog +signal_cmd=systemctl restart rsyslog compressed=1 others=1 reverse=0 diff --git a/syslog/config-Redhat-Enterprise-Linux-6.0-ALL b/syslog/config-Redhat-Enterprise-Linux-6.0-ALL index 71d558fac..97abbd49c 100644 --- a/syslog/config-Redhat-Enterprise-Linux-6.0-ALL +++ b/syslog/config-Redhat-Enterprise-Linux-6.0-ALL @@ -3,7 +3,7 @@ syslogd=/sbin/rsyslogd m4_conf=0 syslog_conf=/etc/rsyslog.conf pri_dir=1 -pid_file=/var/run/rsyslogd.pid /run/syslogd.pid +pid_file=/run/rsyslogd.pid facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 m4_path= sync=1 @@ -19,8 +19,9 @@ file_/var/log/news.crit=desc_news file_/var/log/news.err=desc_news file_/var/log/news.notice=desc_news socket=0 -start_cmd=service rsyslog start -restart_cmd=service rsyslog reload +start_cmd=systemctl start rsyslog +restart_cmd=systemctl restart rsyslog +signal_cmd=systemctl restart rsyslog compressed=1 others=1 reverse=0 diff --git a/syslog/config-Rocky-Linux-6.0-ALL b/syslog/config-Rocky-Linux-6.0-ALL index a6567ef0a..97abbd49c 100644 --- a/syslog/config-Rocky-Linux-6.0-ALL +++ b/syslog/config-Rocky-Linux-6.0-ALL @@ -3,7 +3,7 @@ syslogd=/sbin/rsyslogd m4_conf=0 syslog_conf=/etc/rsyslog.conf pri_dir=1 -pid_file=/var/run/rsyslogd.pid /run/syslogd.pid +pid_file=/run/rsyslogd.pid facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 m4_path= sync=1 @@ -19,8 +19,9 @@ file_/var/log/news.crit=desc_news file_/var/log/news.err=desc_news file_/var/log/news.notice=desc_news socket=0 -start_cmd=service rsyslog start -restart_cmd=service rsyslog restart +start_cmd=systemctl start rsyslog +restart_cmd=systemctl restart rsyslog +signal_cmd=systemctl restart rsyslog compressed=1 others=1 reverse=0 diff --git a/syslog/config-Ubuntu-Linux-10.04-ALL b/syslog/config-Ubuntu-Linux-10.04-ALL index dad8de098..37cf0a685 100644 --- a/syslog/config-Ubuntu-Linux-10.04-ALL +++ b/syslog/config-Ubuntu-Linux-10.04-ALL @@ -11,9 +11,9 @@ pipe=1 tags=0 lines=100 socket=0 -start_cmd=/usr/sbin/service rsyslog start -restart_cmd=/usr/sbin/service rsyslog restart -signal_cmd=/usr/sbin/service rsyslog restart +start_cmd=systemctl start rsyslog +restart_cmd=systemctl restart rsyslog +signal_cmd=systemctl restart rsyslog compressed=1 others=1 reverse=0 diff --git a/syslog/config-debian-linux-5.0-ALL b/syslog/config-debian-linux-5.0-9.0 similarity index 100% rename from syslog/config-debian-linux-5.0-ALL rename to syslog/config-debian-linux-5.0-9.0 diff --git a/syslog/config-debian-linux-9.0-ALL b/syslog/config-debian-linux-9.0-ALL new file mode 100644 index 000000000..37cf0a685 --- /dev/null +++ b/syslog/config-debian-linux-9.0-ALL @@ -0,0 +1,19 @@ +pri_all=1 +syslogd=/usr/sbin/rsyslogd +m4_conf=0 +syslog_conf=/etc/rsyslog.conf +pri_dir=1 +pid_file=/var/run/rsyslogd.pid +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 +m4_path= +sync=1 +pipe=1 +tags=0 +lines=100 +socket=0 +start_cmd=systemctl start rsyslog +restart_cmd=systemctl restart rsyslog +signal_cmd=systemctl restart rsyslog +compressed=1 +others=1 +reverse=0 diff --git a/syslog/config-redhat-linux-24.0-ALL b/syslog/config-redhat-linux-24.0-ALL index bff614b30..97abbd49c 100644 --- a/syslog/config-redhat-linux-24.0-ALL +++ b/syslog/config-redhat-linux-24.0-ALL @@ -3,6 +3,7 @@ syslogd=/sbin/rsyslogd m4_conf=0 syslog_conf=/etc/rsyslog.conf pri_dir=1 +pid_file=/run/rsyslogd.pid facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 m4_path= sync=1 @@ -18,8 +19,9 @@ file_/var/log/news.crit=desc_news file_/var/log/news.err=desc_news file_/var/log/news.notice=desc_news socket=0 -start_cmd=systemctl start rsyslog.service -restart_cmd=systemctl restart rsyslog.service +start_cmd=systemctl start rsyslog +restart_cmd=systemctl restart rsyslog +signal_cmd=systemctl restart rsyslog compressed=1 others=1 reverse=0 diff --git a/syslog/config-redhat-linux-ALL-15.0 b/syslog/config-redhat-linux-ALL-15.0 deleted file mode 100644 index a36e291d4..000000000 --- a/syslog/config-redhat-linux-ALL-15.0 +++ /dev/null @@ -1,26 +0,0 @@ -pri_all=1 -syslogd=/sbin/syslogd -m4_conf=0 -syslog_conf=/etc/syslog.conf -pri_dir=1 -pid_file=/var/run/syslogd.pid -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -m4_path= -sync=1 -pipe=1 -tags=0 -lines=100 -file_/var/log/messages=desc_sysmesg -file_/var/log/secure=desc_auth -file_/var/log/maillog=desc_mail -file_/var/log/spooler=desc_uucp -file_/var/log/boot.log=desc_boot -file_/var/log/news.crit=desc_news -file_/var/log/news.err=desc_news -file_/var/log/news.notice=desc_news -socket=0 -start_cmd=/etc/rc.d/init.d/syslog start -restart_cmd=/etc/rc.d/init.d/syslog reload -compressed=1 -others=1 -reverse=0