Skip to content
This repository was archived by the owner on Jan 6, 2022. It is now read-only.

Commit 83ecd18

Browse files
n0emisn0emis
committed
remove lxc-ssh and install updates
1 parent ae18894 commit 83ecd18

File tree

13 files changed

+56
-872
lines changed

13 files changed

+56
-872
lines changed

‎ansible.cfg

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ fact_caching_timeout = 86400
88
nocows = 1
99
vault_password_file = vault/gpg-wrapper.sh
1010
callback_whitelist = timer
11-
connection_plugins = connection_plugins
12-
#strategy_plugins = mitogen/ansible_mitogen/plugins/strategy
13-
#strategy = mitogen_linear
11+
strategy_plugins = mitogen/ansible_mitogen/plugins/strategy
12+
strategy = mitogen_linear
1413

1514
[ssh_connection]
1615
pipelining=True

‎connection_plugins/lxc_ssh.py

-847
This file was deleted.

‎files/caddy/elara.het.nue.de.n0emis.eu/nextwolke

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
nextwolke.net {
2+
reverse_proxy https://10.152.16.3 {
3+
header_up Host nextwolke.net
4+
5+
transport http {
6+
tls_insecure_skip_verify
7+
}
8+
}
9+
}

‎files/zones/n0emis.eu

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ORIGIN n0emis.eu.
22
@ 3600 IN SOA ns1.n0emis.eu. noc.n0emis.eu. (
3-
2021050802 ; serial ;;; UPDATE THIS AFTER EACH EDIT!
3+
2021051301 ; serial ;;; UPDATE THIS AFTER EACH EDIT!
44
1800 ; refresh (30 min)
55
1800 ; retry (30 min)
66
1209600 ; expire (14 day)
@@ -27,7 +27,7 @@ ns3 3600 IN ALIAS himalia.ion.rhr.de.n0emis.eu.
2727
;;;; Cloud
2828
elara.het.nue.de 3600 IN A 78.46.251.132
2929
elara.het.nue.de 3600 IN AAAA 2a01:4f8:c0c:34bc::1
30-
dfz.elara.het.nue.de 3600 IN AAAA 2a01:4f8:c0c:34bc:1::2
30+
dfz-el.het.nue.de 3600 IN AAAA 2a01:4f8:c0c:34bc:1::2
3131

3232
ganymed.het.hel.fi 3600 IN A 95.217.163.175
3333
ganymed.het.hel.fi 3600 IN AAAA 2a01:4f9:c010:7b6e::1

‎files/zones/n0emis.network

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ORIGIN n0emis.network.
22
@ 3600 IN SOA ns1.n0emis.eu. noc.n0emis.eu. (
3-
2021040801 ; serial ;;; UPDATE THIS AFTER EACH EDIT!
3+
2021043001 ; serial ;;; UPDATE THIS AFTER EACH EDIT!
44
1800 ; refresh (30 min)
55
1800 ; retry (30 min)
66
1209600 ; expire (14 day)
@@ -41,3 +41,4 @@ autodiscover 3600 IN CNAME ganymed.het.hel.fi.n0emis.eu.
4141

4242
;; Pages
4343
@ 3600 IN ALIAS elara.het.nue.de.n0emis.eu.
44+
shop 3600 IN CNAME pasiphae.int.goe.de.n0emis.eu.

‎files/zones/n0emis.tk

+28
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ $ORIGIN n0emis.tk.
1717
ns 3600 IN A 212.227.174.29
1818
ns 3600 IN AAAA 2001:8d8:1800:30e::1
1919

20+
@ IN MX 1 testmail
21+
22+
testmail IN A 95.217.235.169
23+
testmail IN AAAA 2a01:4f9:c011:1d14::1
24+
autodiscover IN CNAME testmail
25+
autoconfig IN CNAME testmail
26+
2027
;; Server
2128
himalia 3600 IN A 212.227.174.29
2229
himalia 3600 IN AAAA 2001:8d8:1800:30e::1
@@ -32,3 +39,24 @@ grafana IN CNAME c102-100.cloud.gwdg.de.
3239
dashboard IN CNAME c102-100.cloud.gwdg.de.
3340

3441
fediventure IN CNAME carpo.gwd.goe.de.n0emis.eu.
42+
observium IN CNAME pasiphae.int.goe.de.n0emis.eu.
43+
44+
carpo IN CNAME carpo.gwd.goe.de.n0emis.eu.
45+
*.carpo IN CNAME carpo.gwd.goe.de.n0emis.eu.
46+
47+
turn-test-1 IN A 141.5.102.100
48+
turn-test-1 IN AAAA 2001:470:6c:287::2
49+
turn-1-test IN A 141.5.102.100
50+
turn-1-test IN AAAA 2001:470:6c:287::2
51+
turn-test-2 IN A 141.5.102.104
52+
turn-2-test IN A 141.5.102.104
53+
54+
turn-test-3 IN A 116.203.25.110
55+
turn-test-3 IN AAAA 2a01:4f8:c0c:a77f::1
56+
turn-test-4 IN A 116.203.104.230
57+
58+
ffgoe-map IN CNAME pasiphae.int.goe.de.n0emis.eu.
59+
60+
pki IN A 78.47.242.197
61+
62+
*.pki IN CNAME pki

‎files/zones/noemis.network

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ORIGIN noemis.network.
22
@ 3600 IN SOA ns1.n0emis.eu. noc.n0emis.eu. (
3-
2021042101 ; serial ;;; UPDATE THIS AFTER EACH EDIT!
3+
2021043001 ; serial ;;; UPDATE THIS AFTER EACH EDIT!
44
1800 ; refresh (30 min)
55
1800 ; retry (30 min)
66
1209600 ; expire (14 day)
@@ -41,3 +41,4 @@ autodiscover 3600 IN CNAME ganymed.het.hel.fi.n0emis.eu.
4141

4242
;; Pages
4343
@ 3600 IN ALIAS elara.het.nue.de.n0emis.eu.
44+
shop 3600 IN CNAME pasiphae.int.goe.de.n0emis.eu.

‎group_vars/all/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ local_asn: "{{ 4200000000 + (((wireguard_server_address | ipaddr('address')).spl
3131
local_ll: "fe80::{{ (wireguard_server_address | ipaddr('address')).split('.')[0] }}:{{ (wireguard_server_address | ipaddr('address')).split('.')[1] }}:{{ (wireguard_server_address | ipaddr('address')).split('.')[2] }}:{{ (wireguard_server_address | ipaddr('address')).split('.')[3] }}"
3232

3333
wireguard_mesh_neighbours: "{{ groups['wireguard_member'] }}"
34-
wireguard_server_private_key: "{{ lookup('passwordstore', 'infra/' + ansible_fqdn + '/wg_server') }}"
35-
wireguard_server_public_key: "{{ lookup('passwordstore', 'infra/' + ansible_fqdn + '/wg_server subkey=public') }}"
34+
wireguard_server_private_key: "{{ lookup('passwordstore', 'infra/' + inventory_hostname + '/wg_server') }}"
35+
wireguard_server_public_key: "{{ lookup('passwordstore', 'infra/' + inventory_hostname + '/wg_server subkey=public') }}"
3636

3737
wireguard_peer_port: "{{ 65535 - (((wireguard_server_address | ipaddr('address') | ipaddr('int')) - ('10.152.0.0' | ipaddr('int'))) / 4) | int }}"

‎group_vars/git.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
gitea_version: "1.14.1"
2+
gitea_version: "1.14.2"
33

44
gitea_user: "git"
55
gitea_home: "/var/lib/gitea"

‎group_vars/hedgedoc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
hedgedoc_version: "1.8.1"
2+
hedgedoc_version: "1.8.2"
33

44
hedgedoc_db_database: "hackmd"
55
hedgedoc_db_username: "{{ lookup('passwordstore', 'infra/' + ansible_fqdn + '/codimd/db subkey=user') }}"

‎group_vars/synapse.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
---
2-
synapse_pip_version: "1.33.1"
2+
synapse_pip_version: "1.33.2"
33
element_version: "1.7.27"
44

5-
synapse_pip_packages:
6-
- "pip"
7-
- "setuptools"
8-
- "matrix-synapse[all]=={{ synapse_pip_version }}"
9-
- "cryptography==3.3.2"
10-
- "pyOpenSSL"
11-
125
synapse_database_host: "localhost"
136
synapse_database_database: "synapse"
147
synapse_database_user: "{{ lookup('passwordstore', 'infra/' + ansible_fqdn + '/synapse/db subkey=user') }}"

‎hosts

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ sinope.int.goe.de.n0emis.eu
9999

100100
[dn42]
101101
himalia.ion.rhr.de.n0emis.eu
102-
dn42.chaldene.gwd.goe.de.n0emis.eu ansible_host=chaldene.gwd.goe.de.n0emis.eu ansible_connection=lxc_ssh ansible_ssh_extra_args=dn42
102+
dn42.chaldene.gwd.goe.de.n0emis.eu ansible_host=dn42 ansible_connection=lxc mitogen_via=chaldene.gwd.goe.de.n0emis.eu
103103

104104
[wireguard:children]
105105
wireguard-mesh
@@ -180,12 +180,12 @@ chaldene.gwd.goe.de.n0emis.eu
180180
ganymed.het.hel.fi.n0emis.eu
181181

182182
[librenms]
183-
nms.kalyke.yol.wob.de.n0emis.eu ansible_host=kalyke.yol.wob.de.n0emis.eu ansible_connection=lxc_ssh ansible_ssh_extra_args=nms
183+
nms.kalyke.yol.wob.de.n0emis.eu ansible_host=nms ansible_connection=lxc mitogen_via=kalyke.yol.wob.de.n0emis.eu
184184

185185
[all]
186-
ca-prod.chaldene.gwd.goe.de.n0emis.eu ansible_host=chaldene.gwd.goe.de.n0emis.eu ansible_connection=lxc_ssh ansible_ssh_extra_args=ca-prod
187-
ca-staging.chaldene.gwd.goe.de.n0emis.eu ansible_host=chaldene.gwd.goe.de.n0emis.eu ansible_connection=lxc_ssh ansible_ssh_extra_args=ca-staging
188-
ca-db.chaldene.gwd.goe.de.n0emis.eu ansible_host=chaldene.gwd.goe.de.n0emis.eu ansible_connection=lxc_ssh ansible_ssh_extra_args=ca-db
186+
ca-prod.chaldene.gwd.goe.de.n0emis.eu ansible_host=ca-prod ansible_connection=lxc mitogen_via=chaldene.gwd.goe.de.n0emis.eu
187+
ca-staging.chaldene.gwd.goe.de.n0emis.eu ansible_host=ca-staging ansible_connection=lxc mitogen_via=chaldene.gwd.goe.de.n0emis.eu
188+
ca-db.chaldene.gwd.goe.de.n0emis.eu ansible_host=ca-db ansible_connection=lxc mitogen_via=chaldene.gwd.goe.de.n0emis.eu
189189

190190
[unmanaged]
191191
kalyke.yol.wob.de.n0emis.eu ansible_python_interpreter=/run/current-system/sw/bin/python3

‎roles/n0emis.bigbluebutton

0 commit comments

Comments
 (0)