Compare commits

...

2 commits

Author SHA1 Message Date
pettai c077fa4405
make $dnsapiport dynamic 2024-06-14 10:20:46 +02:00
pettai 4605f00aa2
OCD fix 2024-06-13 15:22:54 +02:00
3 changed files with 7 additions and 4 deletions

View file

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

View file

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

View file

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