[__recycledcloud_nginx_vhost] remove .orig files, fix lport parameter

2021-03-08 08:49:03 +01:00 · 2021-03-08 08:49:03 +01:00 · 7af78934f0
parent 50e5cab481
commit 7af78934f0
3 changed files with 1 additions and 14 deletions
--- a/type/__recycledcloud_nginx_vhost/parameter/boolean.orig
+++ b/type/__recycledcloud_nginx_vhost/parameter/boolean.orig
@ -1,7 +0,0 @@
-<<<<<<< HEAD
-noindex
-=======
-no-tls
-no-hsts
-obtain-cert
->>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost.
--- a/type/__recycledcloud_nginx_vhost/parameter/optional
+++ b/type/__recycledcloud_nginx_vhost/parameter/optional
@ -1,3 +1,4 @@
 domain
 config
 altdomains
+lport
--- a/type/__recycledcloud_nginx_vhost/parameter/optional.orig
+++ b/type/__recycledcloud_nginx_vhost/parameter/optional.orig
@ -1,7 +0,0 @@
-<<<<<<< HEAD
-index
-=======
-domain
-lport
-config
->>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost.