Compare commits

...

4 commits

Author SHA1 Message Date
Sophie Schiller
944c116839 jh toolz from original source 2024-05-18 13:27:38 +02:00
Sophie Schiller
1ac8a53a9a revive jhtoolz 2024-05-18 13:07:42 +02:00
Sophie Schiller
e2f36c483b jhtoolz static 2024-05-18 11:13:27 +02:00
Sophie Schiller
666329eca6 htz-cloud.jugendhackt: add new node 2024-05-18 11:13:27 +02:00
3 changed files with 84 additions and 2 deletions

View file

@ -1,7 +1,7 @@
directories['/opt/jugendhackt_tools/src'] = {} directories['/opt/jugendhackt_tools/src'] = {}
git_deploy['/opt/jugendhackt_tools/src'] = { git_deploy['/opt/jugendhackt_tools/src'] = {
'repo': 'https://github.com/kunsi/jugendhackt_schedule.git', 'repo': 'https://github.com/Kunsi/jugendhackt_schedule.git',
'rev': 'main', 'rev': 'main',
'triggers': { 'triggers': {
'action:jugendhackt_tools_install', 'action:jugendhackt_tools_install',
@ -16,6 +16,7 @@ actions['jugendhackt_tools_create_virtualenv'] = {
'needs': { 'needs': {
# actually /opt/jugendhackt_tools, but we don't create that # actually /opt/jugendhackt_tools, but we don't create that
'directory:/opt/jugendhackt_tools/src', 'directory:/opt/jugendhackt_tools/src',
'pkg_apt:python3-virtualenv',
}, },
} }
@ -27,6 +28,7 @@ actions['jugendhackt_tools_install'] = {
]), ]),
'needs': { 'needs': {
'action:jugendhackt_tools_create_virtualenv', 'action:jugendhackt_tools_create_virtualenv',
'pkg_apt:python3-pip',
}, },
'triggered': True, 'triggered': True,
} }

View file

@ -11,8 +11,9 @@ fi
if systemctl is-active wide-dhcpv6-client; if systemctl is-active wide-dhcpv6-client;
then then
systemctl stop wide-dhcpv6-client systemctl stop wide-dhcpv6-client
sleep 1 sleep 60
systemctl start wide-dhcpv6-client systemctl start wide-dhcpv6-client
else else
sleep 60
systemctl start wide-dhcpv6-client systemctl start wide-dhcpv6-client
fi fi

View file

@ -0,0 +1,79 @@
# jugend hackt toolz
nodes['htz-cloud.jugendhackt'] = {
'bundles': {
'jugendhackt_tools',
'postgresql',
'zfs',
},
'groups': {
'debian-bookworm',
'webserver',
},
'metadata': {
'interfaces': {
'eth0': {
'ips': {
'65.21.106.160',
'2a01:4f9:c012:cfd9::/64',
},
'gateway4': '172.31.1.1',
'gateway6': 'fe80::1',
},
},
'jugendhackt_tools': {
'allowed_hosts': ['jh.sophies-kitchen.eu'],
'timezone': 'Europe/Berlin',
},
'nginx': {
'vhosts': {
'jugendhackt_tools': {
'domain': 'jh.sophies-kitchen.eu',
'locations': {
'/': {
'target': 'http://127.0.0.1:22090/',
},
'/static/': {
'alias': '/opt/jugendhackt_tools/src/static/',
},
},
},
},
},
'postgresql': {
'version': '16',
},
'sysctl': {
'options': {
# XXX find out if this is really needed
'net.ipv4.ip_forward': '1',
'net.ipv6.conf.all.forwarding': '1',
},
},
'vm': {
'cpu': 2,
'ram': 4,
},
'users': {
'sophie': {
'enable_linger': True,
'ssh_pubkey': [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDILcYrMQNRVXAm5L+7No1ZumqfCyRc1QZmTY3O7Q8hsE4+fCAvwsWm2aSMfLL3NnIl8Nm1Rixzic5jdYKYNIY3SlX1wvTB+MhGb2eyVSd7c/Y98aCLSlDkQ2sebjpdA1FoJOeGD3qxqDwj0+KckXU2ZaSSQY7CxVsjH65UxCHqVAg+6uLdNbj7j850s1B9NXVXef+sBQ5jUngXxnqQWwNh2Mn8auwumkeEG4SYf96wyFkLvmBitOng/GyLWl9YPnXXHHDnatcVipy7y34qw4CQ4P84anecbA+Bqr9IcxBW6qYmYgRKEnAcmEfjQd+BI1gCLB1BBEmb/qp+mVLd4tOh sophie@carbon"
],
},
},
'zfs': {
'pools': {
'tank': {
'when_creating': {
'config': [{
'devices': {
'/dev/sdb',
},
}]
},
},
},
},
},
}