diff --git a/README.md b/README.md index 7e8e15f..68de867 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,9 @@ Also some basic mods will get a pre-config added. (_prefork, evasive_) * **Note:** If you want all domain-names to get 'caught' by a site/server you need to add an underline '*' as alias or domain!
This will also be done automatically if no domain is supplied. + +* **Warning:** Not every setting/variable you provide will be checked for validity. Bad config might break the role! + ## Requirements * Community collection and certificate role: ```ansible-galaxy install -r requirements.yml``` diff --git a/templates/etc/apache2/sites-available/site.conf.j2 b/templates/etc/apache2/sites-available/site.conf.j2 index f768cfe..fa8e6c3 100644 --- a/templates/etc/apache2/sites-available/site.conf.j2 +++ b/templates/etc/apache2/sites-available/site.conf.j2 @@ -160,7 +160,7 @@ {% if site.app_include %} # additional application config include - IncludeOptional site_{{ name }}_app.conf + IncludeOptional /etc/apache2/sites-available/site_{{ name }}_app.conf {% endif %} diff --git a/templates/systemd/system/ansibleguy.infra_apache.LetsEncryptCertbot.service.j2 b/templates/systemd/system/ansibleguy.infra_apache.LetsEncryptCertbot.service.j2 deleted file mode 100644 index 4d5994a..0000000 --- a/templates/systemd/system/ansibleguy.infra_apache.LetsEncryptCertbot.service.j2 +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Service to renew LetsEncrypt Certificates using certbot - -[Service] -Type=oneshot -ExecStart=certbot renew -{{ APACHE_CONFIG.letsencrypt.verbosity }} --non-interactive --agree-tos --renew-with-new-domains --rsa-key-size {{ APACHE_CONFIG.letsencrypt.key_size }} -SuccessExitStatus=0 diff --git a/templates/systemd/system/ansibleguy.infra_apache.LetsEncryptCertbot.timer.j2 b/templates/systemd/system/ansibleguy.infra_apache.LetsEncryptCertbot.timer.j2 deleted file mode 100644 index 8ee6c0e..0000000 --- a/templates/systemd/system/ansibleguy.infra_apache.LetsEncryptCertbot.timer.j2 +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Timer to renew LetsEncrypt Certificates using certbot - -[Timer] -OnCalendar={{ APACHE_CONFIG.letsencrypt.renew_timer }} -Persistent=false -WakeSystem=false - -[Install] -WantedBy=multi-user.target