global/overlay/etc/puppet/cosmos-rules.yaml

@@ -19,12 +19,11 @@ dns-rest-api1.sunet.se:
    dns:
    dns::knotdns:
    dns::apache2:
-     dnsapiport = '8443'
    sunet::certbot::acmed:
    sunet::baas2:
      nodename: 7B9DBFE1F4D1
      backup_dirs:
-       - '/etc/'
+       - '/etc'
        - '/var/'
      exclude_list:
        - '/.../dsmsched.log'

global/overlay/etc/puppet/modules/dns/manifests/apache2.pp

@@ -1,6 +1,4 @@
-class dns::apache2 (
+class dns::apache2 {
-  $dnsapiport = '8443',
-){
 
   package { ['apache2', 'libapache2-mod-qos', 'python3-certbot-apache']:
         ensure => installed,
@@ -36,6 +34,6 @@ class dns::apache2 (
     rule => "add rule inet filter input tcp dport 80 counter accept comment \"allow-apache2-http\""
   }
   sunet::nftables::rule { 'apache-https':
-    rule => "add rule inet filter input tcp dport $dnsapiport counter accept comment \"allow-apache2-https\""
+    rule => "add rule inet filter input tcp dport 443 counter accept comment \"allow-apache2-https\""
   }
 }

global/overlay/etc/puppet/modules/dns/templates/apache2/dns-rest-api.conf.erb

@@ -6,7 +6,7 @@
 	RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
 </VirtualHost>
 <IfModule mod_ssl.c>
-<VirtualHost *:<%= @dnsapiport %>>
+<VirtualHost *:443>
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined