Unbrand nginx types from e-Durable

type/__nginx/man.rst

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

type/__nginx/manifest

@@ -37,7 +37,7 @@ then
 fi
 
 # 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
 
 # Obtaining TLS cert.
@@ -48,7 +48,7 @@ fi
 
 __uacme_account
 # 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" \
 		--altdomains "$altdomains" \
 		$set_custom_uacme_hookscript \
@@ -68,9 +68,9 @@ if [ -f "${__object:?}/parameter/config" ]; then
 	mkdir -p "${__object:?}/files"
 	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"
 else
-	require="__uacme_obtain/$domain" __recycledcloud_nginx_vhost "$domain" \
+	require="__uacme_obtain/$domain" __nginx_vhost "$domain" \
 		--altdomains "$altdomains"
 fi

type/__nginx_vhost/manifest

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