bundles/nextcloud/items.py

@@ -80,6 +80,15 @@ files = {
             'directory:/etc/nextcloud',
         ],
     },
+    '/opt/nextcloud/rescan': {
+        'owner': 'www-data',
+        'group': 'www-data',
+        'mode': '550',
+        'needs': [
+            'directory:/opt/nextcloud',
+            'action:extract_nextcloud',
+        ],
+    },
 }
 
 # SETUP
@@ -97,7 +106,7 @@ actions['install_nextcloud'] = {
         admin_pass=node.metadata.get('nextcloud/admin_pass'),
         data_dir='/var/lib/nextcloud',
     ),
-    'unless': repo.libs.nextcloud.occ('status') + ' | grep -q "installed: true"',
+    'unless': repo.libs.nextcloud.occ('status', output='json') + ' | jq -r .installed | grep -q "^true$"',
     'needs': [
         'directory:/etc/nextcloud',
         'directory:/opt/nextcloud',
@@ -132,15 +141,3 @@ actions['nextcloud_add_missing_inidces'] = {
         f'action:extract_nextcloud',
     ],
 }
-
-# RESCAN
-
-files['/opt/nextcloud/rescan'] = {
-    'owner': 'www-data',
-    'group': 'www-data',
-    'mode': '550',
-    'needs': [
-        'directory:/opt/nextcloud',
-        'action:extract_nextcloud',
-    ],
-}