From 0bf160ab069459330c0abb94f75be52322724ad5 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 23 Sep 2018 21:19:50 +0000 Subject: [PATCH] Amazon Linux 2 beta support --- apache/config-Amazon-Linux-2-ALL | 18 ++++++++++++++ dhcpd/config-Amazon-Linux-2-ALL | 15 ++++++++++++ exports-nfs4/config-Amazon-Linux-2-ALL | 4 ++++ exports/config-Amazon-Linux-2-ALL | 3 +++ ipsec/config-Amazon-Linux-2-ALL | 8 +++++++ iscsi-tgtd/config-Amazon-Linux-2-ALL | 8 +++++++ ldap-server/config-Amazon-Linux-2-ALL | 11 +++++++++ lpadmin/config-Amazon-Linux-2-ALL | 17 +++++++++++++ mysql/config-Amazon-Linux-2-ALL | 22 +++++++++++++++++ os_list.txt | 5 +++- postgresql/config-Amazon-Linux-2-ALL | 25 +++++++++++++++++++ proftpd/config-Amazon-Linux-2-ALL | 10 ++++++++ samba/config-Amazon-Linux-2-ALL | 17 +++++++++++++ sendmail/config-Amazon-Linux-2-ALL | 33 ++++++++++++++++++++++++++ squid/config-Amazon-Linux-2-ALL | 20 ++++++++++++++++ syslog-ng/config-Amazon-Linux-2-ALL | 7 ++++++ xinetd/config-Amazon-Linux-2-ALL | 6 +++++ 17 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 apache/config-Amazon-Linux-2-ALL create mode 100644 dhcpd/config-Amazon-Linux-2-ALL create mode 100644 exports-nfs4/config-Amazon-Linux-2-ALL create mode 100644 exports/config-Amazon-Linux-2-ALL create mode 100644 ipsec/config-Amazon-Linux-2-ALL create mode 100644 iscsi-tgtd/config-Amazon-Linux-2-ALL create mode 100644 ldap-server/config-Amazon-Linux-2-ALL create mode 100644 lpadmin/config-Amazon-Linux-2-ALL create mode 100644 mysql/config-Amazon-Linux-2-ALL create mode 100644 postgresql/config-Amazon-Linux-2-ALL create mode 100644 proftpd/config-Amazon-Linux-2-ALL create mode 100644 samba/config-Amazon-Linux-2-ALL create mode 100644 sendmail/config-Amazon-Linux-2-ALL create mode 100644 squid/config-Amazon-Linux-2-ALL create mode 100644 syslog-ng/config-Amazon-Linux-2-ALL create mode 100644 xinetd/config-Amazon-Linux-2-ALL diff --git a/apache/config-Amazon-Linux-2-ALL b/apache/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..920810b33 --- /dev/null +++ b/apache/config-Amazon-Linux-2-ALL @@ -0,0 +1,18 @@ +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 diff --git a/dhcpd/config-Amazon-Linux-2-ALL b/dhcpd/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..f39ecb8e1 --- /dev/null +++ b/dhcpd/config-Amazon-Linux-2-ALL @@ -0,0 +1,15 @@ +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 diff --git a/exports-nfs4/config-Amazon-Linux-2-ALL b/exports-nfs4/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..5f33701d8 --- /dev/null +++ b/exports-nfs4/config-Amazon-Linux-2-ALL @@ -0,0 +1,4 @@ +restart_command=service nfs restart +exports_file=/etc/exports +nfs_server=rpc.nfsd +apply_cmd=exportfs -r diff --git a/exports/config-Amazon-Linux-2-ALL b/exports/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..dcd467c14 --- /dev/null +++ b/exports/config-Amazon-Linux-2-ALL @@ -0,0 +1,3 @@ +restart_command=service nfs restart +exports_file=/etc/exports +apply_cmd=exportfs -r diff --git a/ipsec/config-Amazon-Linux-2-ALL b/ipsec/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..4a6de2034 --- /dev/null +++ b/ipsec/config-Amazon-Linux-2-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 diff --git a/iscsi-tgtd/config-Amazon-Linux-2-ALL b/iscsi-tgtd/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..5ed82442e --- /dev/null +++ b/iscsi-tgtd/config-Amazon-Linux-2-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 diff --git a/ldap-server/config-Amazon-Linux-2-ALL b/ldap-server/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..dd5c13e1c --- /dev/null +++ b/ldap-server/config-Amazon-Linux-2-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 diff --git a/lpadmin/config-Amazon-Linux-2-ALL b/lpadmin/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..f7b20bd03 --- /dev/null +++ b/lpadmin/config-Amazon-Linux-2-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 diff --git a/mysql/config-Amazon-Linux-2-ALL b/mysql/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..04b3fa0c8 --- /dev/null +++ b/mysql/config-Amazon-Linux-2-ALL @@ -0,0 +1,22 @@ +start_cmd=service mariadb start +stop_cmd=service mariadb stop +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=0 +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 diff --git a/os_list.txt b/os_list.txt index c5f95f0fa..efc9911e9 100644 --- a/os_list.txt +++ b/os_list.txt @@ -75,9 +75,12 @@ cAos Linux $1 redhat-linux sprintf("%.1f", 10.0+$1) `cat /etc/caos-release 2>/ Wind River Linux 3.0 redhat-linux 18.0 `cat /etc/wrs-release 2>/dev/null` =~ /Wind\s+River\s+Linux\s+3\.0/ Wind River Linux 2.0 redhat-linux 16.0 `cat /etc/wrs-release 2>/dev/null` =~ /Wind\s+River\s+Linux\s+2\.0/ -# Amazon Linux +# Amazon Linux (1.x) Amazon Linux $1 redhat-linux 20.0 `cat /etc/system-release 2>/dev/null` =~ /Amazon\s+Linux.*\s(201[1-9])/ +# Amazon Linux (2, approximately based on CentOS 7) +Amazon Linux $1 redhat-linux 15.0 `cat /etc/system-release 2>/dev/null` =~ /Amazon\s+Linux\s+2\n/ + # Free Redhat Linux and Fedora Redhat Linux $1 redhat-linux $1 `cat /etc/redhat-release 2>/dev/null` =~ /red.*hat.*release\s+(\S+)/i && `cat /etc/redhat-release 2>/dev/null` !~ /[eE]nterprise|AS|ES|WS|[aA]dvanced/ Fedora Linux $1 redhat-linux sprintf("%.1f", 9.0+$1) `cat /etc/redhat-release /etc/fedora-release 2>/dev/null` =~ /Fedora.*\s([0-9\.]+)\s/i || `cat /etc/redhat-release /etc/fedora-release 2>/dev/null` =~ /Fedora.*\sFC(\S+)\s/i diff --git a/postgresql/config-Amazon-Linux-2-ALL b/postgresql/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..02a086f4e --- /dev/null +++ b/postgresql/config-Amazon-Linux-2-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/run/postmaster*.pid +perpage=25 +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 diff --git a/proftpd/config-Amazon-Linux-2-ALL b/proftpd/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..634b33a07 --- /dev/null +++ b/proftpd/config-Amazon-Linux-2-ALL @@ -0,0 +1,10 @@ +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 diff --git a/samba/config-Amazon-Linux-2-ALL b/samba/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..ba5ed552d --- /dev/null +++ b/samba/config-Amazon-Linux-2-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 +stop_cmd=systemctl stop smb +smbgroupedit=/usr/bin/smbgroupedit +pdbedit=/usr/bin/pdbedit +net=/usr/bin/net diff --git a/sendmail/config-Amazon-Linux-2-ALL b/sendmail/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..6ac713680 --- /dev/null +++ b/sendmail/config-Amazon-Linux-2-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 diff --git a/squid/config-Amazon-Linux-2-ALL b/squid/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..28ee8fd27 --- /dev/null +++ b/squid/config-Amazon-Linux-2-ALL @@ -0,0 +1,20 @@ +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=service squid start +squid_stop=service squid stop +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 diff --git a/syslog-ng/config-Amazon-Linux-2-ALL b/syslog-ng/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..33ba28ec9 --- /dev/null +++ b/syslog-ng/config-Amazon-Linux-2-ALL @@ -0,0 +1,7 @@ +lines=20 +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 diff --git a/xinetd/config-Amazon-Linux-2-ALL b/xinetd/config-Amazon-Linux-2-ALL new file mode 100644 index 000000000..900435f49 --- /dev/null +++ b/xinetd/config-Amazon-Linux-2-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