wip

composer_lock_reset

bundles/macbook/files/freshclam.conf

@@ -0,0 +1 @@
+DatabaseMirror database.clamav.net

bundles/macbook/items.py

@@ -1,3 +1,12 @@
+# brew install
+
+actions['brew_install'] = {
+    'command': '/opt/homebrew/bin/brew install ' + ' '.join(node.metadata.get('brew')),
+    'unless': f"""PKGS=$(/opt/homebrew/bin/brew leaves); for p in {' '.join(node.metadata.get('brew'))}; do grep -q "$p" <<< $PKGS || exit 9; done"""
+}
+
+# bw init
+
 directories['/Users/mwiegand/.config/bundlewrap/lock'] = {}
 
 # home
@@ -21,6 +30,16 @@ files['/Users/mwiegand/.local/share/direnv/pyenv'] = {}
 files['/Users/mwiegand/.local/share/direnv/venv'] = {}
 files['/Users/mwiegand/.local/share/direnv/bundlewrap'] = {}
 
+
+# clamav
+
+files['/opt/homebrew/etc/clamav/freshclam.conf'] = {
+    'group': 'admin',
+}
+# run me baby one more time:
+# freshclam && clamscan --infected --recursive --exclude-dir ~/Library/Mail ~
+
+
 ##################
 
 for element in [*files.values(), *directories.values()]:

bundles/macbook/metadata.py

@@ -1 +1,5 @@
-defaults = {}
+defaults = {
+    'brew': {
+        'clamav',
+    },
+}

bundles/roundcube/files/config.inc.php

@@ -31,7 +31,7 @@ $config['db_dsnw'] = '${database['provider']}://${database['user']}:${database['
 // For example %n = mail.domain.tld, %t = domain.tld
 // WARNING: After hostname change update of mail_host column in users table is
 //          required to match old user data records with the new host.
-$config['default_host'] = 'localhost';
+$config['imap_host'] = 'localhost';
 
 // ----------------------------------
 // SMTP
@@ -46,7 +46,7 @@ $config['default_host'] = 'localhost';
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %t = domain.tld
-$config['smtp_server'] = 'tls://localhost';
+$config['smtp_host'] = 'tls://localhost';
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login

bundles/roundcube/items.py

@@ -43,7 +43,7 @@ actions['extract_roundcube'] = {
     ],
     'triggers': [
         'action:chown_roundcube',
-        'action:composer_install',
+        'action:composer_lock_reset',
     ],
 }
 actions['chown_roundcube'] = {
@@ -75,7 +75,16 @@ files['/opt/roundcube/plugins/password/config.inc.php'] = {
         'action:chown_roundcube',
     ],
 }
-
+actions['composer_lock_reset'] = {
+    'command': 'rm /opt/roundcube/composer.lock',
+    'triggered': True,
+    'needs': [
+        'action:chown_roundcube',
+    ],
+    'triggers': [
+        'action:composer_install',
+    ],
+}
 actions['composer_install'] = {
     'command': "cp /opt/roundcube/composer.json-dist /opt/roundcube/composer.json && su www-data -s /bin/bash -c '/usr/bin/composer -d /opt/roundcube install'",
     'triggered': True,

nodes/netcup.mails.py

@@ -194,8 +194,8 @@
         },
         'roundcube': {
             'product_name': 'Sublimity Mail',
-            'version': '1.5.0',
+            'version': '1.6.2',
-            'installer': True,
+            'installer': False,
         },
         'vm': {
             'cores': 4,