From fed5cbfc5228104d45c2b4f9aa6a1b75470e974b Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 23 Feb 2025 12:08:14 +0100 Subject: [PATCH] bundles/php: remove sury repo, use debian php version --- bundles/icinga2/metadata.py | 1 - bundles/nginx/items.py | 2 +- bundles/php/items.py | 2 +- bundles/php/metadata.py | 17 +++++++------ data/apt/files/gpg-keys/php.asc | 42 --------------------------------- nodes/carlene.toml | 1 - nodes/htz-cloud/pirmasens.py | 2 -- nodes/rottenraptor-server.toml | 1 - 8 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 data/apt/files/gpg-keys/php.asc diff --git a/bundles/icinga2/metadata.py b/bundles/icinga2/metadata.py index 60d28fe..c25ca41 100644 --- a/bundles/icinga2/metadata.py +++ b/bundles/icinga2/metadata.py @@ -54,7 +54,6 @@ defaults = { 'setup-token': repo.vault.password_for(f'{node.name} icingaweb2 setup-token'), }, 'php': { - 'version': '8.2', 'packages': { 'curl', 'gd', diff --git a/bundles/nginx/items.py b/bundles/nginx/items.py index 2928686..304dcd7 100644 --- a/bundles/nginx/items.py +++ b/bundles/nginx/items.py @@ -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, diff --git a/bundles/php/items.py b/bundles/php/items.py index b115c19..c836efa 100644 --- a/bundles/php/items.py +++ b/bundles/php/items.py @@ -1,4 +1,4 @@ -version = node.metadata.get('php/version') +version = node.metadata.get('php/__version') directories['/var/lib/php/sessions'] = { 'owner': 'www-data', diff --git a/bundles/php/metadata.py b/bundles/php/metadata.py index d14954e..edb8399 100644 --- a/bundles/php/metadata.py +++ b/bundles/php/metadata.py @@ -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}': {}, diff --git a/data/apt/files/gpg-keys/php.asc b/data/apt/files/gpg-keys/php.asc deleted file mode 100644 index ba04e3c..0000000 --- a/data/apt/files/gpg-keys/php.asc +++ /dev/null @@ -1,42 +0,0 @@ ------BEGIN PGP ARMORED FILE----- -Comment: Use "gpg --dearmor" for unpacking - -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 -=gNGr ------END PGP ARMORED FILE----- diff --git a/nodes/carlene.toml b/nodes/carlene.toml index 6509140..a455063 100644 --- a/nodes/carlene.toml +++ b/nodes/carlene.toml @@ -176,7 +176,6 @@ ratelimit-exempt-hosts = [ ] [metadata.php] -version = "8.2" packages = [ 'gd', 'imagick', diff --git a/nodes/htz-cloud/pirmasens.py b/nodes/htz-cloud/pirmasens.py index 655f325..908e85e 100644 --- a/nodes/htz-cloud/pirmasens.py +++ b/nodes/htz-cloud/pirmasens.py @@ -52,12 +52,10 @@ nodes['htz-cloud.pirmasens'] = { }, }, 'php': { - 'version': '7.4', 'packages': { 'gd', 'imap', 'intl', - 'json', 'mbstring', 'opcache', 'pgsql', diff --git a/nodes/rottenraptor-server.toml b/nodes/rottenraptor-server.toml index e88891a..96eb5fb 100644 --- a/nodes/rottenraptor-server.toml +++ b/nodes/rottenraptor-server.toml @@ -41,7 +41,6 @@ domain = "sso.rotten.city" domain = "immich.rotten.city" [metadata.php] -version = "8.2" packages = [ "xml", ]