diff --git a/bundles/crystal/metadata.py b/bundles/crystal/metadata.py index 48c3eb9..5bb1b83 100644 --- a/bundles/crystal/metadata.py +++ b/bundles/crystal/metadata.py @@ -1,10 +1,12 @@ +debian_version = min([node.os_version, (11,)])[0] # FIXME + defaults = { 'apt': { 'packages': { 'crystal': {}, }, 'sources': { - 'deb https://download.opensuse.org/repositories/devel:/languages:/crystal/Debian_{version}/ /', + f'deb https://download.opensuse.org/repositories/devel:/languages:/crystal/Debian_{debian_version}/ /', }, }, } diff --git a/bundles/icinga2/metadata.py b/bundles/icinga2/metadata.py index 0dd3c20..511462a 100644 --- a/bundles/icinga2/metadata.py +++ b/bundles/icinga2/metadata.py @@ -10,6 +10,7 @@ defaults = { }, 'sources': { 'deb https://packages.icinga.com/debian icinga-{codename} main', + 'deb-src https://packages.icinga.com/debian icinga-{codename} main', }, }, 'icinga2': { diff --git a/bundles/icingaweb2/metadata.py b/bundles/icingaweb2/metadata.py index 346961d..6ef45cb 100644 --- a/bundles/icingaweb2/metadata.py +++ b/bundles/icingaweb2/metadata.py @@ -163,6 +163,7 @@ def nginx(metadata): metadata.get('icingaweb2/hostname'): { 'content': 'icingaweb2/vhost.conf', 'context': { + 'php_version': metadata.get('php/version'), }, }, }, diff --git a/bundles/influxdb2/metadata.py b/bundles/influxdb2/metadata.py index 98dc0d3..c23b137 100644 --- a/bundles/influxdb2/metadata.py +++ b/bundles/influxdb2/metadata.py @@ -7,7 +7,7 @@ defaults = { 'influxdb2-cli': {}, }, 'sources': { - 'deb https://repos.influxdata.com/debian {codename} stable', + 'deb https://repos.influxdata.com/debian stable main' }, }, 'nftables': { diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py index 6d5835e..7c0c925 100644 --- a/bundles/nginx/metadata.py +++ b/bundles/nginx/metadata.py @@ -5,6 +5,9 @@ defaults = { 'apt': { 'packages': { 'nginx': {}, + 'apache2': { + 'installed': False, + }, }, }, 'nftables': { diff --git a/data/icingaweb2/vhost.conf b/data/icingaweb2/vhost.conf index d37ec69..15eb4c4 100644 --- a/data/icingaweb2/vhost.conf +++ b/data/icingaweb2/vhost.conf @@ -20,7 +20,7 @@ server { } location ~ ^/icingaweb2/index\.php(.*)$ { - fastcgi_pass unix:/run/php/php7.4-fpm.sock; + fastcgi_pass unix:/run/php/php${php_version}-fpm.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param SCRIPT_FILENAME /usr/share/icingaweb2/public/index.php; diff --git a/nodes/home.server.py b/nodes/home.server.py index 1c751a0..a012c92 100644 --- a/nodes/home.server.py +++ b/nodes/home.server.py @@ -3,7 +3,7 @@ 'groups': [ 'autologin', 'backup', - 'debian-11', + 'debian-12', 'home', 'nextcloud', 'monitored', @@ -46,6 +46,11 @@ 'gateway4': '10.0.0.1', }, }, + 'apt': { + 'packages': { + 'firmware-realtek': {}, + }, + }, 'build-server': { 'hostname': 'build.sublimity.de', 'architectures': { @@ -106,7 +111,7 @@ }, 'nextcloud': { 'hostname': 'cloud.sublimity.de', - 'version': '25.0.8', + 'version': '27.0.0', 'config': { 'instanceid': 'oci6dw1woodz', 'secret': '!decrypt:encrypt$gAAAAABj96CFynVtEgsje7173zjQAcY7xQG3uyf5cxE-sJAvhyPh_KUykTKdwnExc8NTDJ8RIGUmVfgC6or5crnYaggARPIEg5-Cb0xVdEPPZ3oZ01ImLmynLu3qXT9O8kVM-H21--OKeztMRn7bySsbXdWEGtETFQ==',