Merge branch 'master' of ssh://dev.ccchb.de:2222/ccchb/ansible

This commit is contained in:
Crest 2024-06-03 11:48:41 +02:00
commit 954a51901e
1 changed files with 3 additions and 17 deletions

View File

@ -32,16 +32,10 @@ haproxy_http:
addr: '2a01:4f8:150:926f::11' addr: '2a01:4f8:150:926f::11'
- host: 'kasse.z1.ccchb.de' - host: 'kasse.z1.ccchb.de'
addr: '2a01:4f8:150:926f::11' addr: '2a01:4f8:150:926f::11'
- host: 'kasse.zweigstelle.space'
addr: '2a01:4f8:150:926f::11'
- host: 'jabber.ccchb.de' - host: 'jabber.ccchb.de'
addr: '2a01:4f8:150:926f::13' addr: '2a01:4f8:150:926f::13'
- host: 'matrix.ccchb.de' - host: 'matrix.ccchb.de'
addr: '2a01:4f8:150:926f::13' addr: '2a01:4f8:150:926f::13'
- host: 'element.ccchb.de'
addr: '2a01:4f8:150:926f::13'
- host: 'frab.ccchb.de'
addr: '2a01:4f8:150:926f::17'
- host: 'auth.ccchb.de' - host: 'auth.ccchb.de'
addr: '2a01:4f8:150:926f::11' addr: '2a01:4f8:150:926f::11'
@ -64,16 +58,8 @@ haproxy_sni:
addr: '2a01:4f8:150:926f::11' addr: '2a01:4f8:150:926f::11'
- host: 'kasse.z1.ccchb.de' - host: 'kasse.z1.ccchb.de'
addr: '2a01:4f8:150:926f::11' addr: '2a01:4f8:150:926f::11'
- host: 'kasse.zweigstelle.space'
addr: '2a01:4f8:150:926f::11'
- host: 'jabber.ccchb.de' - host: 'jabber.ccchb.de'
addr: '2a01:4f8:150:926f::13' addr: '2a01:4f8:150:926f::13'
- host: 'matrix.ccchb.de'
addr: '2a01:4f8:150:926f::13'
- host: 'element.ccchb.de'
addr: '2a01:4f8:150:926f::13'
- host: 'frab.ccchb.de'
addr: '2a01:4f8:150:926f::17'
- host: 'auth.ccchb.de' - host: 'auth.ccchb.de'
addr: '2a01:4f8:150:926f::11' addr: '2a01:4f8:150:926f::11'
@ -105,7 +91,7 @@ bhyve_guests:
- name: dn42 - name: dn42
index: 1 index: 1
enabled: true enabled: false
ram: 1G ram: 1G
cpus: 1 cpus: 1
image: debian-10.5.0-amd64-netinst.iso image: debian-10.5.0-amd64-netinst.iso
@ -181,7 +167,7 @@ bhyve_guests:
- name: wiki - name: wiki
index: 6 index: 6
enabled: true enabled: true
ram: 1G ram: 2G
cpus: 1 cpus: 1
image: debian-10.5.0-amd64-netinst.iso image: debian-10.5.0-amd64-netinst.iso
order: order:
@ -225,7 +211,7 @@ bhyve_guests:
- name: frab - name: frab
index: 9 index: 9
enabled: true enabled: false
ram: 1G ram: 1G
cpus: 1 cpus: 1
image: ubuntu-22.04.1-live-server-amd64.iso image: ubuntu-22.04.1-live-server-amd64.iso