Compare commits
2 commits
3589751773
...
c077fa4405
Author | SHA1 | Date | |
---|---|---|---|
pettai | c077fa4405 | ||
pettai | 4605f00aa2 |
|
@ -19,11 +19,12 @@ 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'
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
class dns::apache2 {
|
||||
class dns::apache2 (
|
||||
$dnsapiport = '8443',
|
||||
){
|
||||
|
||||
package { ['apache2', 'libapache2-mod-qos', 'python3-certbot-apache']:
|
||||
ensure => installed,
|
||||
|
@ -34,6 +36,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 443 counter accept comment \"allow-apache2-https\""
|
||||
rule => "add rule inet filter input tcp dport $dnsapiport counter accept comment \"allow-apache2-https\""
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
|
||||
</VirtualHost>
|
||||
<IfModule mod_ssl.c>
|
||||
<VirtualHost *:443>
|
||||
<VirtualHost *:<%= @dnsapiport %>>
|
||||
ErrorLog ${APACHE_LOG_DIR}/error.log
|
||||
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
||||
|
||||
|
|
Loading…
Reference in a new issue