Go back to two step bootstrap

deploy/server.yaml

@@ -18,6 +18,11 @@ spec:
             namespace: home-server
             wave: 2
 
+          - name: databases
+            path: applications/20-databases
+            namespace: database
+            wave: 2
+
           - name: domain-names
             path: applications/30-domain-names
             namespace: home-server
@@ -26,12 +31,12 @@ spec:
           - name: authentik
             path: applications/50-authentik
             namespace: home-server
-            wave: 4
+            wave: 3
 
           - name: nextcloud
             path: applications/50-nextcloud
             namespace: home-server
-            wave: 4
+            wave: 3
 
   template:
     metadata:
@@ -52,54 +57,3 @@ spec:
         syncOptions:
           - CreateNamespace=true
           - SyncWave={{wave | default "0"}}
-
----
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: home-server-databases
-  namespace: argocd
-spec:
-  generators:
-    - list:
-        elements:
-          - name: mariadb-operators
-            path: applications/20-databases/mariadb-operators
-            namespace: database
-            wave: 1
-          - name: postgresql
-            path: applications/20-databases/postgresql
-            namespace: database
-            wave: 1
-          - name: influxdb
-            path: applications/20-databases/influxdb
-            namespace: database
-            wave: 1
-          - name: redis
-            path: applications/20-databases/redis
-            namespace: database
-            wave: 1
-          - name: mariadb-database
-            path: applications/20-databases/mariadb-database
-            namespace: database
-            wave: 2
-  template:
-    metadata:
-      name: '{{name}}'
-    spec:
-      project: default
-      source:
-        repoURL: 'https://repobase.net/j/home-server.git'
-        targetRevision: HEAD
-        path: '{{path}}'
-      destination:
-        server: 'https://kubernetes.default.svc'
-        namespace: '{{namespace | default "database"}}'
-      syncPolicy:
-        automated:
-          prune: true
-          selfHeal: true
-        syncOptions:
-          - CreateNamespace=true
-          - SyncWave={{wave | default "0"}}
-