bundles/php: remove sury repo, use debian php version

This commit is contained in:
Franzi 2025-02-23 12:08:14 +01:00
parent fab81145ca
commit fed5cbfc52
Signed by: kunsi
GPG key ID: 12E3D2136B818350
8 changed files with 10 additions and 58 deletions

View file

@ -54,7 +54,6 @@ defaults = {
'setup-token': repo.vault.password_for(f'{node.name} icingaweb2 setup-token'),
},
'php': {
'version': '8.2',
'packages': {
'curl',
'gd',

View file

@ -104,7 +104,7 @@ for vhost, config in node.metadata.get('nginx/vhosts', {}).items():
'context': {
'create_logs': config.get('create_logs', False),
'create_timing_log': config.get('timing_log', True),
'php_version': node.metadata.get('php/version', ''),
'php_version': node.metadata.get('php/__version', ''),
'security_txt': security_txt_enabled,
'vhost': vhost,
**config,

View file

@ -1,4 +1,4 @@
version = node.metadata.get('php/version')
version = node.metadata.get('php/__version')
directories['/var/lib/php/sessions'] = {
'owner': 'www-data',

View file

@ -1,12 +1,11 @@
OS_PHP_VERSION = {
12: '8.2',
13: '8.4',
}
defaults = {
'apt': {
'repos': {
'php': {
'items': {
'deb https://packages.sury.org/php/ {os_release} main',
},
},
},
'php': {
'__version': OS_PHP_VERSION[node.os_version[0]],
},
}
@ -15,7 +14,7 @@ defaults = {
'apt/packages',
)
def php_packages_with_features(metadata):
version = metadata.get('php/version')
version = metadata.get('php/__version')
packages = {
f'php{version}': {},