From b2c9a0afd006733f509443b2a86a4f63586ee4eb Mon Sep 17 00:00:00 2001 From: mwiegand Date: Fri, 16 Jul 2021 00:47:48 +0200 Subject: [PATCH] wip --- bundles/gitea/files/app.ini | 2 +- bundles/islamicstate.eu/items.py | 6 ++++++ bundles/islamicstate.eu/metadata.py | 12 ++++++++++++ data/nginx/html.conf | 10 ++++++++++ nodes/htz.mails.py | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 bundles/islamicstate.eu/items.py create mode 100644 bundles/islamicstate.eu/metadata.py create mode 100644 data/nginx/html.conf diff --git a/bundles/gitea/files/app.ini b/bundles/gitea/files/app.ini index 3517aa1..182e984 100644 --- a/bundles/gitea/files/app.ini +++ b/bundles/gitea/files/app.ini @@ -18,7 +18,7 @@ DOMAIN = ${domain} HTTP_ADDR = 0.0.0.0 HTTP_PORT = 3500 ROOT_URL = https://${domain}/ -DISABLE_SSH = false +DISABLE_SSH = true SSH_PORT = 22 LFS_START_SERVER = true LFS_CONTENT_PATH = /var/lib/gitea/data/lfs diff --git a/bundles/islamicstate.eu/items.py b/bundles/islamicstate.eu/items.py new file mode 100644 index 0000000..b091a67 --- /dev/null +++ b/bundles/islamicstate.eu/items.py @@ -0,0 +1,6 @@ +directories['/var/www/islamicstate.eu'] = {} + +git_deploy['/var/www/islamicstate.eu'] = { + 'repo': 'https://git.sublimity.de/cronekorkn/islamicstate.eu.git', + 'rev': 'master', +} diff --git a/bundles/islamicstate.eu/metadata.py b/bundles/islamicstate.eu/metadata.py new file mode 100644 index 0000000..4f60d34 --- /dev/null +++ b/bundles/islamicstate.eu/metadata.py @@ -0,0 +1,12 @@ +defaults = { + 'nginx': { + 'vhosts': { + 'islamicstate.eu': { + 'content': 'nginx/html.conf', + 'context': { + 'root': '/var/www/islamicstate.eu', + }, + } + }, + }, +} diff --git a/data/nginx/html.conf b/data/nginx/html.conf new file mode 100644 index 0000000..06ae9fb --- /dev/null +++ b/data/nginx/html.conf @@ -0,0 +1,10 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name ${server_name}; + + ssl_certificate /var/lib/dehydrated/certs/${server_name}/fullchain.pem; + ssl_certificate_key /var/lib/dehydrated/certs/${server_name}/privkey.pem; + + root ${root}; +} diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py index db4dd6e..7b105dc 100644 --- a/nodes/htz.mails.py +++ b/nodes/htz.mails.py @@ -10,6 +10,7 @@ 'dnsserver', ], 'bundles': [ + 'islamicstate.eu', 'wireguard', 'zfs', ],