Unbrand nginx types from e-Durable

This commit is contained in:
fnux 2021-06-22 13:50:48 +02:00
parent 41cf480b25
commit 8db890deb4
No known key found for this signature in database
GPG key ID: 4502C902C00A1E12
17 changed files with 9 additions and 7 deletions

View file

@ -1,14 +1,14 @@
cdist-type__recycledcloud_nginx(7) cdist-type__nginx(7)
=================================== ===================================
NAME NAME
---- ----
cdist-type__recycledcloud_nginx - Serve web content with NGINX cdist-type__nginx - Serve web content with NGINX
DESCRIPTION DESCRIPTION
----------- -----------
Leverages `__recycledcloud_nginx_vhost` to serve web content. Leverages `__nginx_vhost` to serve web content.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
@ -31,6 +31,7 @@ uacme-hookscript
AUTHORS AUTHORS
------- -------
Timothée Floure <timothee.floure@posteo.net> Timothée Floure <timothee.floure@posteo.net>
Joachim Desroches <joachim.desroches@epfl.ch>
COPYING COPYING
------- -------

View file

@ -37,7 +37,7 @@ then
fi fi
# Deploy simple HTTP vhost, allowing to serve ACME challenges. # Deploy simple HTTP vhost, allowing to serve ACME challenges.
__recycledcloud_nginx_vhost "301-to-https-$domain" \ __nginx_vhost "301-to-https-$domain" \
--domain "$domain" --altdomains "$altdomains" --to-https --domain "$domain" --altdomains "$altdomains" --to-https
# Obtaining TLS cert. # Obtaining TLS cert.
@ -48,7 +48,7 @@ fi
__uacme_account __uacme_account
# shellcheck disable=SC2086 # shellcheck disable=SC2086
require="__recycledcloud_nginx_vhost/301-to-https-$domain __uacme_account" \ require="__nginx_vhost/301-to-https-$domain __uacme_account" \
__uacme_obtain "$domain" \ __uacme_obtain "$domain" \
--altdomains "$altdomains" \ --altdomains "$altdomains" \
$set_custom_uacme_hookscript \ $set_custom_uacme_hookscript \
@ -68,9 +68,9 @@ if [ -f "${__object:?}/parameter/config" ]; then
mkdir -p "${__object:?}/files" mkdir -p "${__object:?}/files"
cat "$nginx_logic" > "${__object:?}/files/config" cat "$nginx_logic" > "${__object:?}/files/config"
require="__uacme_obtain/$domain" __recycledcloud_nginx_vhost "$domain" \ require="__uacme_obtain/$domain" __nginx_vhost "$domain" \
--altdomains "$altdomains" --config "${__object:?}/files/config" --altdomains "$altdomains" --config "${__object:?}/files/config"
else else
require="__uacme_obtain/$domain" __recycledcloud_nginx_vhost "$domain" \ require="__uacme_obtain/$domain" __nginx_vhost "$domain" \
--altdomains "$altdomains" --altdomains "$altdomains"
fi fi

View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2020 Joachim Desroches <joachim.desroches@epfl.ch> # 2020 Joachim Desroches <joachim.desroches@epfl.ch>
# 2021 Timothée Floure <timothee.floure@posteo.net>
# #
# This file is part of cdist. # This file is part of cdist.
# #