RecycledCloud/cdist-recycledcloud
Archived
6
0
Fork 0
Code Releases Activity

[__recycledcloud_nginx_vhost] remove .orig files, fix lport parameter

Browse source
This commit is contained in:
Timothée Floure 2021-03-08 08:49:03 +01:00
parent 50e5cab481
commit 7af78934f0
Signed by: tfloure
GPG key ID: 4502C902C00A1E12
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
type/__recycledcloud_nginx_vhost/parameter/boolean.orig
View file

@ -1,7 +0,0 @@
<<<<<<< HEAD
noindex
=======
no-tls
no-hsts
obtain-cert
>>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost.

1
type/__recycledcloud_nginx_vhost/parameter/optional
View file

@ -1,3 +1,4 @@
domain domain
config config
altdomains altdomains
lport

7
type/__recycledcloud_nginx_vhost/parameter/optional.orig
View file

@ -1,7 +0,0 @@
<<<<<<< HEAD
index
=======
domain
lport
config
>>>>>>> 65f3457... Move out ungleich legacy type; merge presets, static and vhost.