From fe8083afadda850a9d79ddfdc0eaf0c2b3cb69e7 Mon Sep 17 00:00:00 2001
From: Actaeus Curabitur <actcur@actcur.com>
Date: Thu, 25 Aug 2022 07:36:22 -0500
Subject: [PATCH] Removed collabora from nextcloud, updated user for nextcloud

---
 states/roles/maintain/nextcloud/init.sls    | 23 +++++++++------------
 states/systems/core/freeipa/manual/init.sls |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/states/roles/maintain/nextcloud/init.sls b/states/roles/maintain/nextcloud/init.sls
index 795967c..de22f2e 100644
--- a/states/roles/maintain/nextcloud/init.sls
+++ b/states/roles/maintain/nextcloud/init.sls
@@ -5,10 +5,7 @@ nextcloud-pkgs:
       - php-gd
       - php-intl
       - nginx
-      - collabora-online-server-nodocker
-      - redis
-      - rabbitmq
-      - postgresql
+#      - collabora-online-server-nodocker
     
 /etc/pacman.d/hooks/nextcloud.hook:
   file.managed:
@@ -41,12 +38,12 @@ rtorrent-php-fpm:
     - group: root
     - mode: 644
       
-/etc/nginx/conf.d/collabora.conf:
-  file.managed:
-    - source: salt://roles/maintain/nextcloud/nginx-collabora.conf
-    - user: root
-    - group: root
-    - mode: 644
+#/etc/nginx/conf.d/collabora.conf:
+#  file.managed:
+#    - source: salt://roles/maintain/nextcloud/nginx-collabora.conf
+#    - user: root
+#    - group: root
+#    - mode: 644
     
 mount:
   group.present:
@@ -62,7 +59,7 @@ nginx-service:
 
 /usr/share/webapps/nextcloud/apps:
   file.directory:
-    - user: http
-    - group: http
+    - user: nextcloud
+    - group: nextcloud
     - dir_mode: 750
-    
\ No newline at end of file
+    
diff --git a/states/systems/core/freeipa/manual/init.sls b/states/systems/core/freeipa/manual/init.sls
index 8954e33..faa0c27 100644
--- a/states/systems/core/freeipa/manual/init.sls
+++ b/states/systems/core/freeipa/manual/init.sls
@@ -11,7 +11,7 @@ set_salt_ipa_password:
 
 create_host:
   cmd.run:
-    - name: 'sshpass -p $SALT_PASSWORD ssh salt@ipa.actcur.com -oStrictHostKeyChecking=no "rm {{hostname}}.keytab;echo $SALT_PASSWORD | kinit salt;ipa host-add --force --ip-address={{ip}} {{hostname}}.actcur.com; ipa host-allow-create-keytab {{hostname}}.actcur.com --groups enroller;/usr/sbin/ipa-getkeytab -s ipa.actcur.com -p host/{{hostname}}.actcur.com -k ./{{hostname}}.keytab"'
+    - name: 'sshpass -p $SALT_PASSWORD ssh salt@ipa.actcur.com -oStrictHostKeyChecking=no "rm {{hostname}}.keytab;echo $SALT_PASSWORD | kinit salt;ipa host-add --force --ip-address={{ip}} {{hostname}}.actcur.com --class=server; ipa host-allow-create-keytab {{hostname}}.actcur.com --groups server_enroller;/usr/sbin/ipa-getkeytab -s ipa.actcur.com -p host/{{hostname}}.actcur.com -k ./{{hostname}}.keytab"'
 
 grab_keytab:
   cmd.run: