From 8db890deb4f4293e30e166a3bb77977440103783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Tue, 22 Jun 2021 13:50:48 +0200 Subject: [PATCH] Unbrand nginx types from e-Durable --- type/{__recycledcloud_nginx => __nginx}/man.rst | 7 ++++--- type/{__recycledcloud_nginx => __nginx}/manifest | 8 ++++---- .../parameter/default/http-port | 0 .../parameter/default/https-port | 0 .../{__recycledcloud_nginx => __nginx}/parameter/optional | 0 .../files/301-to-https | 0 .../files/generic.conf.sh | 0 .../files/hsts | 0 .../files/index.html | 0 .../files/static.conf.sh | 0 .../files/to-https.conf.sh | 0 .../gencode-remote | 0 .../man.rst | 0 .../manifest | 1 + .../parameter/boolean | 0 .../parameter/default/index | 0 .../parameter/optional | 0 17 files changed, 9 insertions(+), 7 deletions(-) rename type/{__recycledcloud_nginx => __nginx}/man.rst (84%) rename type/{__recycledcloud_nginx => __nginx}/manifest (86%) rename type/{__recycledcloud_nginx => __nginx}/parameter/default/http-port (100%) rename type/{__recycledcloud_nginx => __nginx}/parameter/default/https-port (100%) rename type/{__recycledcloud_nginx => __nginx}/parameter/optional (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/files/301-to-https (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/files/generic.conf.sh (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/files/hsts (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/files/index.html (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/files/static.conf.sh (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/files/to-https.conf.sh (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/gencode-remote (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/man.rst (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/manifest (98%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/parameter/boolean (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/parameter/default/index (100%) rename type/{__recycledcloud_nginx_vhost => __nginx_vhost}/parameter/optional (100%) diff --git a/type/__recycledcloud_nginx/man.rst b/type/__nginx/man.rst similarity index 84% rename from type/__recycledcloud_nginx/man.rst rename to type/__nginx/man.rst index b1de718..fa4c5db 100644 --- a/type/__recycledcloud_nginx/man.rst +++ b/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 +Joachim Desroches COPYING ------- diff --git a/type/__recycledcloud_nginx/manifest b/type/__nginx/manifest similarity index 86% rename from type/__recycledcloud_nginx/manifest rename to type/__nginx/manifest index 75db7cd..b552319 100644 --- a/type/__recycledcloud_nginx/manifest +++ b/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 diff --git a/type/__recycledcloud_nginx/parameter/default/http-port b/type/__nginx/parameter/default/http-port similarity index 100% rename from type/__recycledcloud_nginx/parameter/default/http-port rename to type/__nginx/parameter/default/http-port diff --git a/type/__recycledcloud_nginx/parameter/default/https-port b/type/__nginx/parameter/default/https-port similarity index 100% rename from type/__recycledcloud_nginx/parameter/default/https-port rename to type/__nginx/parameter/default/https-port diff --git a/type/__recycledcloud_nginx/parameter/optional b/type/__nginx/parameter/optional similarity index 100% rename from type/__recycledcloud_nginx/parameter/optional rename to type/__nginx/parameter/optional diff --git a/type/__recycledcloud_nginx_vhost/files/301-to-https b/type/__nginx_vhost/files/301-to-https similarity index 100% rename from type/__recycledcloud_nginx_vhost/files/301-to-https rename to type/__nginx_vhost/files/301-to-https diff --git a/type/__recycledcloud_nginx_vhost/files/generic.conf.sh b/type/__nginx_vhost/files/generic.conf.sh similarity index 100% rename from type/__recycledcloud_nginx_vhost/files/generic.conf.sh rename to type/__nginx_vhost/files/generic.conf.sh diff --git a/type/__recycledcloud_nginx_vhost/files/hsts b/type/__nginx_vhost/files/hsts similarity index 100% rename from type/__recycledcloud_nginx_vhost/files/hsts rename to type/__nginx_vhost/files/hsts diff --git a/type/__recycledcloud_nginx_vhost/files/index.html b/type/__nginx_vhost/files/index.html similarity index 100% rename from type/__recycledcloud_nginx_vhost/files/index.html rename to type/__nginx_vhost/files/index.html diff --git a/type/__recycledcloud_nginx_vhost/files/static.conf.sh b/type/__nginx_vhost/files/static.conf.sh similarity index 100% rename from type/__recycledcloud_nginx_vhost/files/static.conf.sh rename to type/__nginx_vhost/files/static.conf.sh diff --git a/type/__recycledcloud_nginx_vhost/files/to-https.conf.sh b/type/__nginx_vhost/files/to-https.conf.sh similarity index 100% rename from type/__recycledcloud_nginx_vhost/files/to-https.conf.sh rename to type/__nginx_vhost/files/to-https.conf.sh diff --git a/type/__recycledcloud_nginx_vhost/gencode-remote b/type/__nginx_vhost/gencode-remote similarity index 100% rename from type/__recycledcloud_nginx_vhost/gencode-remote rename to type/__nginx_vhost/gencode-remote diff --git a/type/__recycledcloud_nginx_vhost/man.rst b/type/__nginx_vhost/man.rst similarity index 100% rename from type/__recycledcloud_nginx_vhost/man.rst rename to type/__nginx_vhost/man.rst diff --git a/type/__recycledcloud_nginx_vhost/manifest b/type/__nginx_vhost/manifest similarity index 98% rename from type/__recycledcloud_nginx_vhost/manifest rename to type/__nginx_vhost/manifest index 3e7b913..f9ad84d 100644 --- a/type/__recycledcloud_nginx_vhost/manifest +++ b/type/__nginx_vhost/manifest @@ -1,6 +1,7 @@ #!/bin/sh # # 2020 Joachim Desroches +# 2021 Timothée Floure # # This file is part of cdist. # diff --git a/type/__recycledcloud_nginx_vhost/parameter/boolean b/type/__nginx_vhost/parameter/boolean similarity index 100% rename from type/__recycledcloud_nginx_vhost/parameter/boolean rename to type/__nginx_vhost/parameter/boolean diff --git a/type/__recycledcloud_nginx_vhost/parameter/default/index b/type/__nginx_vhost/parameter/default/index similarity index 100% rename from type/__recycledcloud_nginx_vhost/parameter/default/index rename to type/__nginx_vhost/parameter/default/index diff --git a/type/__recycledcloud_nginx_vhost/parameter/optional b/type/__nginx_vhost/parameter/optional similarity index 100% rename from type/__recycledcloud_nginx_vhost/parameter/optional rename to type/__nginx_vhost/parameter/optional