From 3871893c9b1814b464c01e3c64b8c77d95feeb57 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 11 Jul 2021 15:24:08 +0200 Subject: [PATCH] move jenkins to rx300 --- .../powerdns/files/bind-zones/franzi.business | 1 + data/powerdns/files/bind-zones/kunsmann.eu | 3 --- nodes/htz/ex42-1048908.py | 20 +++++++------- nodes/rx300.py | 27 ++++++++++++++++--- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business index 13c56cb..b811603 100644 --- a/data/powerdns/files/bind-zones/franzi.business +++ b/data/powerdns/files/bind-zones/franzi.business @@ -15,6 +15,7 @@ dimension IN A 94.130.52.224 dimension IN AAAA 2a01:4f8:10b:2a5f::2 git IN CNAME rx300.kunbox.net. +jenkins IN CNAME rx300.kunbox.net. matrix IN A 94.130.52.224 matrix IN AAAA 2a01:4f8:10b:2a5f::2 diff --git a/data/powerdns/files/bind-zones/kunsmann.eu b/data/powerdns/files/bind-zones/kunsmann.eu index 41a2397..8f10382 100644 --- a/data/powerdns/files/bind-zones/kunsmann.eu +++ b/data/powerdns/files/bind-zones/kunsmann.eu @@ -15,9 +15,6 @@ icinga IN CNAME icinga2.ovh.kunbox.net. influxdb IN CNAME influxdb.htz-cloud.kunbox.net. statusmonitor.icinga IN CNAME icinga2.ovh.kunbox.net. -jenkins IN A 94.130.52.224 -jenkins IN AAAA 2a01:4f8:10b:2a5f::2 - mta-sts IN A 94.130.52.224 mta-sts IN AAAA 2a01:4f8:10b:2a5f::2 diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 925e9ec..cae81bf 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -4,7 +4,7 @@ nodes['htz.ex42-1048908'] = { 'dovecot', 'element-web', # 'gitea', - 'jenkins-ci', +# 'jenkins-ci', 'lm-sensors', 'matrix-media-repo', 'matrix-synapse', @@ -338,15 +338,15 @@ nodes['htz.ex42-1048908'] = { }, }, }, - 'jenkins.kunsmann.eu': { - 'locations': { - '/': { - 'target': 'http://localhost:22010/', - }, - }, - 'website_check_path': '/login', - 'website_check_string': 'Welcome to Jenkins', - }, +# 'jenkins.kunsmann.eu': { +# 'locations': { +# '/': { +# 'target': 'http://localhost:22010/', +# }, +# }, +# 'website_check_path': '/login', +# 'website_check_string': 'Welcome to Jenkins', +# }, 'kunbox.net': {}, 'kunsmann.eu': { 'locations': { diff --git a/nodes/rx300.py b/nodes/rx300.py index c0bfa67..78374b9 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -9,6 +9,7 @@ nodes['rx300'] = { 'bundles': { 'check-mail-received', 'gitea', + 'jenkins-ci', 'lm-sensors', 'miniflux', 'php', @@ -125,12 +126,32 @@ nodes['rx300'] = { }, }, }, - 'unicornsden': { + 'jenkins': { + 'domain': 'jenkins.franzi.business', + 'ssl': '_.franzi.business', + 'locations': { + '/': { + 'target': 'http://localhost:22010/', + }, + }, + 'website_check_path': '/login', + 'website_check_string': 'Welcome to Jenkins', + }, + 'unicornsden-redirect': { 'domain': 'unicornsden.franzi.business', 'ssl': '_.franzi.business', + 'locations': { + '/': { + 'redirect': 'https://map.unicornsden.com/', + }, + }, + }, + 'unicornsden': { + 'domain': 'map.unicornsden.com', + 'php': True, 'webroot_config': { - 'owner': 'kunsi', - 'group': 'kunsi', + 'owner': 'git', + 'group': 'git', 'mode': '0755', }, },