From ea447ba24c6a5613b82b4b8a541e1b58dcab8288 Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Sat, 21 Sep 2024 18:31:00 +0200
Subject: [PATCH] wip

---
 bundles/roundcube/files/config.inc.php        | 64 -------------------
 .../roundcube/files/password.config.inc.php   |  2 -
 bundles/roundcube/items.py                    | 16 +++--
 nodes/htz.mails.py                            |  2 +-
 4 files changed, 11 insertions(+), 73 deletions(-)

diff --git a/bundles/roundcube/files/config.inc.php b/bundles/roundcube/files/config.inc.php
index c4ad8c0..8ab67d1 100644
--- a/bundles/roundcube/files/config.inc.php
+++ b/bundles/roundcube/files/config.inc.php
@@ -6,80 +6,16 @@ $config['enable_installer'] = true;
 
 /* Local configuration for Roundcube Webmail */
 
-
-
-
-
-
-
-
-
 $config['db_dsnw'] = '${database['provider']}://${database['user']}:${database['password']}@${database['host']}/${database['name']}';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 $config['imap_host'] = 'localhost';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 $config['smtp_host'] = 'tls://localhost';
-
-
-
 $config['smtp_user'] = '%u';
-
-
-
 $config['smtp_pass'] = '%p';
-
-
-
 $config['support_url'] = '';
-
-
-
-
 $config['des_key'] = '${des_key}';
-
-
 $config['product_name'] = '${product_name}';
-
-
-
-
-
 $config['plugins'] = array(${', '.join(f'"{plugin}"' for plugin in plugins)});
-
-
-
 $config['language'] = 'de_DE';
-
-
-
 $config['smtp_conn_options'] = array(
    'ssl' => array(
    'verify_peer' => false,
diff --git a/bundles/roundcube/files/password.config.inc.php b/bundles/roundcube/files/password.config.inc.php
index 6f6cdf3..c7a4776 100644
--- a/bundles/roundcube/files/password.config.inc.php
+++ b/bundles/roundcube/files/password.config.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 $config['password_driver'] = 'sql';
 $config['password_strength_driver'] = null;
 $config['password_confirm_current'] = true;
diff --git a/bundles/roundcube/items.py b/bundles/roundcube/items.py
index bd923ec..cbe8487 100644
--- a/bundles/roundcube/items.py
+++ b/bundles/roundcube/items.py
@@ -1,7 +1,8 @@
 assert node.has_bundle('php')
 assert node.has_bundle('mailserver')
 
-version = node.metadata.get('roundcube/version')
+roundcube_version = node.metadata.get('roundcube/version')
+php_version = node.metadata.get('php/version')
 
 directories = {
     '/opt/roundcube': {
@@ -22,9 +23,9 @@ directories = {
 }
 
 
-files[f'/tmp/roundcube-{version}.tar.gz'] = {
+files[f'/tmp/roundcube-{roundcube_version}.tar.gz'] = {
     'content_type': 'download',
-    'source': f'https://github.com/roundcube/roundcubemail/releases/download/{version}/roundcubemail-{version}-complete.tar.gz',
+    'source': f'https://github.com/roundcube/roundcubemail/releases/download/{roundcube_version}/roundcubemail-{roundcube_version}-complete.tar.gz',
     'triggered': True,
 }
 actions['delete_roundcube'] = {
@@ -32,11 +33,11 @@ actions['delete_roundcube'] = {
     'triggered': True,
 }
 actions['extract_roundcube'] = {
-    'command': f'tar xfvz /tmp/roundcube-{version}.tar.gz --strip 1 -C /opt/roundcube',
-    'unless': f'grep -q "Version {version}" /opt/roundcube/index.php',
+    'command': f'tar xfvz /tmp/roundcube-{roundcube_version}.tar.gz --strip 1 -C /opt/roundcube',
+    'unless': f'grep -q "Version {roundcube_version}" /opt/roundcube/index.php',
     'preceded_by': [
         'action:delete_roundcube',
-        f'file:/tmp/roundcube-{version}.tar.gz',
+        f'file:/tmp/roundcube-{roundcube_version}.tar.gz',
     ],
     'needs': [
         'directory:/opt/roundcube',
@@ -64,6 +65,9 @@ files['/opt/roundcube/config/config.inc.php'] = {
     'needs': [
         'action:chown_roundcube',
     ],
+    'triggers': [
+        f'svc_systemd:php{php_version}-fpm.service:restart',
+    ],
 }
 files['/opt/roundcube/plugins/password/config.inc.php'] = {
     'source': 'password.config.inc.php',
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 53d7765..b4356db 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -13,7 +13,7 @@
     ],
     'bundles': [
         'bind-acme',
-        #'build-ci',
+        'build-ci',
         'download-server',
         'islamicstate.eu',
         #'nginx-rtmps',