Merge pull request #1691 from webmin/dev/improve-module-configs

Fix more modules config files

apache/config-CentOS-Stream-Linux-8.0-ALL

@@ -3,7 +3,7 @@ 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

apache/config-Fedora-Linux-20.00-ALL

@@ -0,0 +1,19 @@
+show_list=0
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-Rocky-Linux-7.0-ALL

@@ -1,4 +1,3 @@
-show_list=0
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-debian-linux-10.0-ALL

@@ -0,0 +1,22 @@
+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

apache/config-redhat-linux-24.0-ALL

@@ -1,9 +1,8 @@
-show_list=0
 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 +14,5 @@ test_apachectl=1
 auto_mods=1
 show_names=0
 allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
 format_config=1

bind8/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,56 @@
+soa_style=1
+named_path=/usr/sbin/named
+named_conf=/etc/named.conf
+show_list=1
+records_order=0
+max_zones=50
+rev_def=0
+support_aaaa=1
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+pid_file=/run/named/named.pid
+whois_cmd=whois
+short_names=0
+updserial_def=0
+updserial_on=1
+updserial_man=1
+ndc_cmd=ndc
+forwardzonefilename_format=ZONE.hosts
+reversezonefilename_format=ZONE.rev
+rev_must=0
+ipv6_mode=1
+allow_underscore=1
+by_view=0
+confirm_zone=1
+confirm_rec=0
+no_chroot=0
+relative_paths=0
+rndc_cmd=rndc
+master_dir=/var/named
+slave_dir=/var/named/slaves
+no_pid_chroot=0
+soa_start=0
+rndc_conf=/etc/rndc.conf
+rndcconf_cmd=rndc-confgen
+largezones=0
+checkzone=named-checkzone
+keygen=dnssec-keygen
+signzone=dnssec-signzone
+checkconf=named-checkconf
+other_slaves=1
+keygen=dnssec-keygen
+tmpl_dnssec=0
+dnssec_period=21
+tmpl_dnssec_dt=1
+dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
+dnssectools_rollrec=/var/named/system.rollrec
+dnssectools_keydir=/var/named/dtkeys
+dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
+force_random=0
+spf_record=0
+dnssec_info=1
+start_cmd=systemctl start named.service
+stop_cmd=systemctl stop named.service
+restart_cmd=systemctl reload named.service

dhcpd/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,16 @@
+start_cmd=systemctl start dhcpd
+stop_cmd=systemctl stop dhcpd
+restart_cmd=service dhcpd restart
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+dhcpd_path=/usr/sbin/dhcpd
+lease_file=/var/lib/dhcpd/dhcpd.leases
+lease_sort=0
+dhcpd_nocols=5
+lease_tz=0
+interfaces_type=redhat
+show_ip=0
+show_mac=0
+group_name=0
+display_max=100
+desc_name=0
+lease_vendor=0

dovecot/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,4 @@
+dovecot=/usr/sbin/dovecot
+dovecot_config=/etc/dovecot/dovecot.conf
+init_script=dovecot.service
+pid_file=/run/dovecot/master.pid

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

exports/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,3 @@
+restart_command=service nfs restart
+exports_file=/etc/exports
+apply_cmd=exportfs -r

ipsec/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,8 @@
+file=/etc/ipsec.conf
+secrets=/etc/ipsec.secrets
+ipsec=/usr/local/sbin/ipsec
+policies_dir=/etc/ipsec.d/policies
+start_cmd=systemctl start ipsec
+stop_cmd=systemctl stop ipsec
+restart_cmd=systemctl restart ipsec
+logfile=/var/log/messages

iscsi-tgtd/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,8 @@
+config_file=/etc/tgt/tgtd.conf
+tgtd=tgtd
+tgtadm=tgtadm
+init_name=tgtd
+tgtadmin=tgt-admin
+start_cmd=systemctl start tgtd
+stop_cmd=systemctl stop tgtd
+restart_cmd=systemctl restart tgtd

ldap-client/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,3 @@
+auth_ldap=/etc/nslcd.conf
+secret=/etc/ldap.secret
+init_name=nslcd

ldap-server/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,11 @@
+config_file=/etc/openldap/slapd.d
+schema_dir=/etc/openldap/schema
+slapd=slapd
+ldap_user=ldap
+browse_max=100
+start_cmd=systemctl start slapd
+stop_cmd=systemctl stop slapd
+apply_cmd=systemctl restart slapd
+init_name=ldap
+data_dir=/var/lib/ldap
+attr_count=6

lpadmin/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,17 @@
+iface_perms=755
+gs_lib=
+iface_arg=
+gs_path=gs
+spool_dir=/var/spool/cups
+model_path=/usr/share/cups/model /etc/cups/ppd
+gs_fontpath=
+smbclient_path=smbclient
+print_style=cups
+show_status=0
+iface_owner=lp:lp
+sort_mode=0
+driver_style=cups
+stop_cmd=systemctl stop cups
+start_cmd=systemctl start cups
+display_mode=0
+show_jobs=0

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

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

mysql/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,23 @@
+start_cmd=systemctl start mariadb
+stop_cmd=systemctl stop mariadb
+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/my.cnf
+max_text=1000
+nopwd=0
+webmin_subs=0
+login=root

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

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

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

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

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

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

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

postgresql/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,25 @@
+login=postgres
+psql=/usr/bin/psql
+basedb=template1
+start_cmd=systemctl start postgresql
+stop_cmd=systemctl stop postgresql
+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
+dump_cmd=/usr/bin/pg_dump
+rstr_cmd=/usr/bin/pg_restore
+repository=/home/db_repository
+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

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

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

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

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

proftpd/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,11 @@
+proftpd_path=/usr/sbin/proftpd
+proftpd_conf=/etc/proftpd.conf
+ftpusers=/etc/ftpusers
+test_config=1
+test_always=0
+test_manual=0
+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

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

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

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

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

samba/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,17 @@
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+smb_passwd=/etc/samba/smbpasswd
+dont_convert=-499
+samba_password_program=/usr/bin/smbpasswd
+samba_status_program=/usr/bin/smbstatus
+samba_server=/usr/sbin/smbd
+name_server=/usr/sbin/nmbd
+smb_conf=/etc/samba/smb.conf
+text_lists=0
+run_from_inetd=0
+swat_path=/usr/sbin/swat
+sort_mode=0
+start_cmd=systemctl start smb && systemctl start nmb
+stop_cmd=systemctl stop smb && systemctl stop nmb
+smbgroupedit=/usr/bin/smbgroupedit
+pdbedit=/usr/bin/pdbedit
+net=/usr/bin/net

sendmail/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,33 @@
+sendmail_cf=/etc/mail/sendmail.cf
+sendmail_mc=/etc/mail/sendmail.mc
+sendmail_features=/usr/share/sendmail-cf
+sendmail_pid=/var/run/sendmail.pid	/var/run/sm-client.pid	/run/sendmail.pid
+makemap_path=makemap
+sendmail_command=service sendmail start
+sendmail_stop_command=service sendmail stop
+sendmail_path=/usr/sbin/sendmail
+mail_dir=/var/spool/mail
+perpage=20
+sort_mode=0
+wrap_width=80
+order_mail=0
+smrsh_dir=/etc/smrsh
+track_read=0
+show_to=0
+max_records=200
+top_buttons=1
+mail_file=mbox
+mail_style=0
+mailq_show=Date,From,To,Size,Status
+index_min=1000000
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+columns=2
+show_cmts=0
+prefix_cmts=0
+
+mail_type=0
+delete_confirm=1

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

spam/config-CentOS-Stream-Linux-8.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

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

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

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

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

squid/config-CentOS-Stream-Linux-8.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=/run/squid.pid
+cachemgr_path=/usr/*/squid/cachemgr.cgi
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid
+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/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

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

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

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

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

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

sshd/config-CentOS-Stream-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

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

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

syslog-ng/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,7 @@
+lines=100
+compressed=1
+syslogng_conf=/etc/syslog-ng/syslog-ng.conf
+syslogng_cmd=syslog-ng
+pid_file=/run/syslog-ng.pid
+start_cmd=systemctl start syslog-ng
+stop_cmd=systemctl stop syslog-ng

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

syslog/config-CentOS-Stream-Linux-8.0-ALL

@@ -1,9 +1,9 @@
 pri_all=1
-syslogd=/sbin/syslogd
+syslogd=/sbin/rsyslogd
 m4_conf=0
-syslog_conf=/etc/syslog.conf
+syslog_conf=/etc/rsyslog.conf
 pri_dir=1
-pid_file=/var/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=/etc/rc.d/init.d/syslog start
-restart_cmd=/etc/rc.d/init.d/syslog reload
+start_cmd=systemctl start rsyslog
+restart_cmd=systemctl restart rsyslog
+signal_cmd=systemctl restart rsyslog
 compressed=1
 others=1
 reverse=0

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

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

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

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

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

xinetd/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,6 @@
+xinetd_conf=/etc/xinetd.conf
+protocols_file=/etc/protocols
+pid_file=/run/xinetd.pid
+start_cmd=systemctl start xinetd
+add_dir=/etc/xinetd.d
+lookup_servs=1