diff --git a/Makefile b/Makefile index c6bf992..08b1885 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,5 @@ tarball: $(RPM_TARBALL_PATH) .PHONY: install install: - install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d - install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d/ conf/security.conf install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/certbot install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/certbot/ conf/ovh.ini.tpl diff --git a/conf/security.conf b/conf/security.conf deleted file mode 100644 index 2a9ad9b..0000000 --- a/conf/security.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Configure ssl module -# See: https://nginx.org/en/docs/http/ngx_http_ssl_module.html -include /etc/letsencrypt/options-ssl-nginx.conf; -ssl_certificate /etc/letsencrypt/live/netoik.io/fullchain.pem; -ssl_certificate_key /etc/letsencrypt/live/netoik.io/privkey.pem; -ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - -# Configure headers -# See: https://nginx.org/en/docs/http/ngx_http_headers_module.html -add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload;" always; - diff --git a/netoik-rp.spec b/netoik-rp.spec index 4b3381c..1858366 100644 --- a/netoik-rp.spec +++ b/netoik-rp.spec @@ -22,7 +22,7 @@ Install the reverse proxy called nginx with a predefined configuration and with %make_install %post -# On install +# After install if [ $1 == 1 ]; then # Replace secrets in ovh.ini %{_bindir}/env envsubst < %{_sysconfdir}/certbot/ovh.ini.tpl > %{_sysconfdir}/certbot/ovh.ini @@ -30,9 +30,9 @@ if [ $1 == 1 ]; then # Create virutal env with certbot cli %{_bindir}/env python3 -m venv /opt/certbot - /opt/certbot/bin/pip install --upgrade pip certbot certbot-dns-ovh + /opt/certbot/bin/pip install --upgrade pip certbot certbot-nginx certbot-dns-ovh %{_bindir}/env ln --symbolic --force --target-directory %{_sbindir} /opt/certbot/bin/certbot - %{_bindir}/env certbot certonly --non-interactive --agree-tos --email samuel.campos@netoik.io --dns-ovh --dns-ovh-credentials "%{_sysconfdir}/certbot/ovh.ini" -d "*.netoik.io" -d "*.samuel-campos.fr" + %{_bindir}/env certbot --nginx --non-interactive --agree-tos --email samuel.campos@netoik.io --dns-ovh --dns-ovh-credentials "%{_sysconfdir}/certbot/ovh.ini" -d "*.netoik.io" -d "*.samuel-campos.fr" %{_bindir}/env printf "\nAutomatic certbot renew\n0 12 * * * root sleep $((RANDOM % 3600)) && certbot renew -q\n" >> %{_sysconfdir}/crontab # Stop nginx to be sure changes are taken in account @@ -42,19 +42,20 @@ fi %{_bindir}/env systemctl start nginx %postun -# On uninstall +# After uninstall if [ $1 == 0 ]; then %{_bindir}/env rm --recursive --force /opt/certbot %{_bindir}/env rm --recursive --force %{_sysconfdir}/certbot + %{_bindir}/env rm --recursive --force %{_sysconfdir}/letsencrypt fi %files -%attr(644, root, root) %config %{_sysconfdir}/nginx/conf.d/security.conf %attr(755, root, root) %dir %{_sysconfdir}/certbot %attr(600, root, root) %config %ghost %{_sysconfdir}/certbot/ovh.ini %attr(644, root, root) %{_sysconfdir}/certbot/ovh.ini.tpl %attr(755, root, root) %dir %ghost /opt/certbot %attr(755, root, root) %ghost %{_sbindir}/certbot +%attr(755, root, root) %dir %ghost %{_sysconfdir}/letsencrypt %changelog %autochangelog