diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f8d933..8e2d3ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,4 +16,6 @@ jobs: Acceptance: needs: Spec uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main" + with: + puppet_version: "puppet8" secrets: "inherit" diff --git a/data/os/RedHat/10.yaml b/data/os/RedHat/10.yaml new file mode 100644 index 0000000..34e14ec --- /dev/null +++ b/data/os/RedHat/10.yaml @@ -0,0 +1,43 @@ +--- +postfix::main_alias_database: 'hash:/etc/aliases' +postfix::main_alias_maps: 'hash:/etc/aliases' +postfix::main_command_directory: '/usr/sbin' +postfix::main_compatibility_level: '2' +postfix::main_daemon_directory: '/usr/libexec/postfix' +postfix::main_data_directory: '/var/lib/postfix' +postfix::main_debug_peer_level: '2' +postfix::main_html_directory: 'no' +postfix::main_inet_protocols: 'all' +postfix::main_mail_owner: 'postfix' +postfix::main_mailq_path: '/usr/bin/mailq.postfix' +postfix::main_manpage_directory: '/usr/share/man' +postfix::main_meta_directory: '/etc/postfix' +postfix::main_newaliases_path: '/usr/bin/newaliases.postfix' +postfix::main_readme_directory: '/usr/share/doc/postfix/README_FILES' +postfix::main_sample_directory: '/usr/share/doc/postfix/samples' +postfix::main_sendmail_path: '/usr/sbin/sendmail.postfix' +postfix::main_setgid_group: 'postdrop' +postfix::main_shlib_directory: '/usr/lib64/postfix' +postfix::main_smtpd_tls_cert_file: '/etc/pki/tls/certs/postfix.pem' +postfix::main_smtpd_tls_key_file: '/etc/pki/tls/certs/postfix.key' +postfix::main_smtpd_tls_security_level: 'may' +postfix::main_smtp_tls_cafile: '/etc/pki/tls/certs/ca-bundle.crt' +postfix::main_smtp_tls_capath: '/etc/pki/tls/certs' +postfix::main_smtp_tls_security_level: 'may' +postfix::main_unknown_local_recipient_reject_code: 550 +postfix::main_append_dot_mydomain: 'no' +postfix::main_biff: 'no' +postfix::main_mailbox_size_limit: 0 +postfix::main_recipient_delimiter: '+' +postfix::main_relayhost: "mailhost.%{facts.networking.domain}" +postfix::main_mydestination: 'localhost' +postfix::main_myorigin: '$myhostname' +postfix::main_myhostname: "%{facts.networking.fqdn}" +postfix::main_queue_directory: '/var/spool/postfix' +postfix::main_transport_maps: '/etc/postfix/transport' +postfix::main_virtual_alias_maps: '/etc/postfix/virtual' +postfix::service_name: 'postfix' +postfix::main_inet_interfaces: + - 'localhost' +postfix::main_mynetworks: + - '127.0.0.0/8' diff --git a/data/os/Rocky/10.yaml b/data/os/Rocky/10.yaml new file mode 100644 index 0000000..dc82984 --- /dev/null +++ b/data/os/Rocky/10.yaml @@ -0,0 +1,34 @@ +--- +postfix::main_compatibility_level: '2' +postfix::main_queue_directory: '/var/spool/postfix' +postfix::main_command_directory: '/usr/sbin' +postfix::main_daemon_directory: '/usr/libexec/postfix' +postfix::main_data_directory: '/var/lib/postfix' +postfix::main_mail_owner: 'postfix' +postfix::main_inet_protocols: 'all' +postfix::main_mydestination: '$myhostname, localhost.$mydomain, localhost' +postfix::main_unknown_local_recipient_reject_code: 550 +postfix::main_alias_maps: 'hash:/etc/aliases' +postfix::main_alias_database: 'hash:/etc/aliases' +postfix::main_debug_peer_level: '2' +postfix::main_sendmail_path: '/usr/sbin/sendmail.postfix' +postfix::main_newaliases_path: '/usr/bin/newaliases.postfix' +postfix::main_mailq_path: '/usr/bin/mailq.postfix' +postfix::main_setgid_group: 'postdrop' +postfix::main_html_directory: 'no' +postfix::main_manpage_directory: '/usr/share/man' +postfix::main_sample_directory: '/usr/share/doc/postfix/samples' +postfix::main_readme_directory: '/usr/share/doc/postfix/README_FILES' +postfix::main_smtpd_tls_cert_file: '/etc/pki/tls/certs/postfix.pem' +postfix::main_smtpd_tls_key_file: '/etc/pki/tls/private/postfix.key' +postfix::main_smtpd_tls_security_level: 'may' +postfix::main_smtp_tls_capath: '/etc/pki/tls/certs' +postfix::main_smtp_tls_cafile: '/etc/pki/tls/certs/ca-bundle.crt' +postfix::main_smtp_tls_security_level: 'may' +postfix::main_meta_directory: '/etc/postfix' +postfix::main_shlib_directory: '/usr/lib64/postfix' +postfix::service_name: 'postfix' +postfix::main_inet_interfaces: + - 'localhost' +postfix::main_custom: + 'debugger_command': 'PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin ddd $daemon_directory/$process_name $process_id & sleep 5' diff --git a/metadata.json b/metadata.json index 3733a2c..cc894fd 100644 --- a/metadata.json +++ b/metadata.json @@ -18,7 +18,8 @@ "operatingsystem": "RedHat", "operatingsystemrelease": [ "8", - "9" + "9", + "10" ] }, { @@ -39,7 +40,8 @@ "operatingsystem": "Rocky", "operatingsystemrelease": [ "8", - "9" + "9", + "10" ] }, { @@ -61,7 +63,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.0.0 < 9.0.0" + "version_requirement": ">= 8.0.0 < 9.0.0" } ], "pdk-version": "3.3.0", diff --git a/provision.yaml b/provision.yaml index 8522d7b..57ace19 100644 --- a/provision.yaml +++ b/provision.yaml @@ -4,10 +4,10 @@ default: images: - 'litmusimage/almalinux:8' - 'litmusimage/almalinux:9' - - 'litmusimage/centos:stream8' - 'litmusimage/centos:stream9' - 'litmusimage/rockylinux:8' - 'litmusimage/rockylinux:9' + - 'litmusimage/rockylinux:10' - 'litmusimage/ubuntu:20.04' - 'litmusimage/ubuntu:22.04' - 'litmusimage/ubuntu:24.04' diff --git a/spec/fixtures/testing/RedHat-10_main.cf b/spec/fixtures/testing/RedHat-10_main.cf new file mode 100644 index 0000000..c32a78e --- /dev/null +++ b/spec/fixtures/testing/RedHat-10_main.cf @@ -0,0 +1,40 @@ +# This file is being maintained by Puppet. +# DO NOT EDIT + +alias_database = hash:/etc/aliases +alias_maps = hash:/etc/aliases +append_dot_mydomain = no +biff = no +command_directory = /usr/sbin +daemon_directory = /usr/libexec/postfix +data_directory = /var/lib/postfix +inet_interfaces = localhost +inet_protocols = all +smtp_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt +smtp_tls_CApath = /etc/pki/tls/certs +smtp_tls_security_level = may +smtpd_tls_security_level = may +smtpd_tls_key_file = /etc/pki/tls/certs/postfix.key +smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem +compatibility_level = 2 +debug_peer_level = 2 +html_directory = no +mailbox_size_limit = 0 +mailq_path = /usr/bin/mailq.postfix +mail_owner = postfix +manpage_directory = /usr/share/man +meta_directory = /etc/postfix +mydestination = localhost +myhostname = foo.example.com +mynetworks = 127.0.0.0/8 +myorigin = $myhostname +newaliases_path = /usr/bin/newaliases.postfix +queue_directory = /var/spool/postfix +readme_directory = /usr/share/doc/postfix/README_FILES +recipient_delimiter = + +sample_directory = /usr/share/doc/postfix/samples +sendmail_path = /usr/sbin/sendmail.postfix +relayhost = mailhost.example.com:25 +setgid_group = postdrop +shlib_directory = /usr/lib64/postfix +unknown_local_recipient_reject_code = 550 diff --git a/spec/fixtures/testing/Rocky-10_main.cf b/spec/fixtures/testing/Rocky-10_main.cf new file mode 100644 index 0000000..1102ca5 --- /dev/null +++ b/spec/fixtures/testing/Rocky-10_main.cf @@ -0,0 +1,33 @@ +# This file is being maintained by Puppet. +# DO NOT EDIT + +alias_database = hash:/etc/aliases +alias_maps = hash:/etc/aliases +command_directory = /usr/sbin +daemon_directory = /usr/libexec/postfix +data_directory = /var/lib/postfix +inet_interfaces = localhost +inet_protocols = all +smtp_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt +smtp_tls_CApath = /etc/pki/tls/certs +smtp_tls_security_level = may +smtpd_tls_security_level = may +smtpd_tls_key_file = /etc/pki/tls/private/postfix.key +smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem +compatibility_level = 2 +debug_peer_level = 2 +html_directory = no +mailq_path = /usr/bin/mailq.postfix +mail_owner = postfix +manpage_directory = /usr/share/man +meta_directory = /etc/postfix +mydestination = $myhostname, localhost.$mydomain, localhost +newaliases_path = /usr/bin/newaliases.postfix +queue_directory = /var/spool/postfix +readme_directory = /usr/share/doc/postfix/README_FILES +sample_directory = /usr/share/doc/postfix/samples +sendmail_path = /usr/sbin/sendmail.postfix +setgid_group = postdrop +shlib_directory = /usr/lib64/postfix +unknown_local_recipient_reject_code = 550 +debugger_command = PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin ddd $daemon_directory/$process_name $process_id & sleep 5