From 7af78934f0dc1edecb9e67a1473f886f991a4fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Mon, 8 Mar 2021 08:49:03 +0100 Subject: [PATCH] [__recycledcloud_nginx_vhost] remove .orig files, fix lport parameter --- type/__recycledcloud_nginx_vhost/parameter/boolean.orig | 7 ------- type/__recycledcloud_nginx_vhost/parameter/optional | 1 + type/__recycledcloud_nginx_vhost/parameter/optional.orig | 7 ------- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 type/__recycledcloud_nginx_vhost/parameter/boolean.orig delete mode 100644 type/__recycledcloud_nginx_vhost/parameter/optional.orig diff --git a/type/__recycledcloud_nginx_vhost/parameter/boolean.orig b/type/__recycledcloud_nginx_vhost/parameter/boolean.orig deleted file mode 100644 index 00ce59e..0000000 --- a/type/__recycledcloud_nginx_vhost/parameter/boolean.orig +++ /dev/null @@ -1,7 +0,0 @@ -<<<<<<< HEAD -noindex -======= -no-tls -no-hsts -obtain-cert ->>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost. diff --git a/type/__recycledcloud_nginx_vhost/parameter/optional b/type/__recycledcloud_nginx_vhost/parameter/optional index 0561d23..9c47616 100644 --- a/type/__recycledcloud_nginx_vhost/parameter/optional +++ b/type/__recycledcloud_nginx_vhost/parameter/optional @@ -1,3 +1,4 @@ domain config altdomains +lport diff --git a/type/__recycledcloud_nginx_vhost/parameter/optional.orig b/type/__recycledcloud_nginx_vhost/parameter/optional.orig deleted file mode 100644 index bb925f0..0000000 --- a/type/__recycledcloud_nginx_vhost/parameter/optional.orig +++ /dev/null @@ -1,7 +0,0 @@ -<<<<<<< HEAD -index -======= -domain -lport -config ->>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost.