From 83bba1b4e3df6d0f76b9b51fcb125859d561f0be Mon Sep 17 00:00:00 2001
From: Celestino Rey <creylopez@yahoo.es>
Date: Tue, 8 Feb 2022 08:52:47 +0100
Subject: [PATCH] Cambios en Nextcloud y collabora

---
 NextCloud/syncNC2LaCie              | 20 ++++++-----
 collabora/collabora-deployment.yaml |  2 +-
 collabora/collabora-secrets.yaml    | 12 +++++++
 collabora/kustomization.yaml        |  2 ++
 collabora/mysql-deployment.yaml     | 54 +++++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 collabora/collabora-secrets.yaml
 create mode 100644 collabora/mysql-deployment.yaml

diff --git a/NextCloud/syncNC2LaCie b/NextCloud/syncNC2LaCie
index a22a06c3..89805c05 100755
--- a/NextCloud/syncNC2LaCie
+++ b/NextCloud/syncNC2LaCie
@@ -1,26 +1,28 @@
 comienzo=$(date "+%Y_%m_%d-%H_%M_%S")
 
 SINCRONIZANDO=/tmp/sincronizando
-#LOG=/tmp/resultadosync.log
+LOG=/tmp/resultadosync.log
 ORIGEN=/mnt/cluster
 DESTINO=/mnt/LaCie/BeeLink
+DESTINOext=/mnt/Externo/Cluster
 
-#echo "$comienzo - Sincronizacion con LaCie" > $LOG
-echo "$comienzo - Sincronizacion con LaCie" 
+echo "$comienzo - Sincronizacion con LaCie" > $LOG
+#echo "$comienzo - Sincronizacion con LaCie" 
 
 if [ ! -f "$SINCRONIZANDO" ]
 then
 	touch $SINCRONIZANDO
-	echo "Empieza sincronización..."
+	echo "Empieza sincronización..." >> $LOG
 	for i in fireflyiii nextcloud nginx reevolution wordpress
 	do
-		echo "Guardando '$i'..." 
-		sudo rsync -avh $ORIGEN/$i $DESTINO --delete
+		echo "Guardando '$i'..."  >> $LOG
+#		sudo rsync -avh $ORIGEN/$i $DESTINO --delete >> $LOG
+		sudo rsync -avh $ORIGEN/$i $DESTINOext --delete >> $LOG
 	done
 	final=$(date "+%Y_%m_%d-%H_%M_%S")
-	echo "$final - Fin de sincronizacion con LaCie"
-#        mensaje="Copia de seguridad del disco duro realizada en la LaCie CloudBox"
-#        sudo -u pi echo $mensaje | mail -s "Copia realizada" "celestino.rey@gmail.com" -A $LOG
+	echo "$final - Fin de sincronizacion con LaCie" >> $LOG
+        mensaje="Copia de seguridad del disco duro realizada en la LaCie CloudBox y en disco externo"
+        sudo -u creylopez echo $mensaje | mail -s "Copia realizada" "celestino.rey@gmail.com" -A $LOG
 	rm $SINCRONIZANDO
 else
 	echo "ya se está sincronizando"
diff --git a/collabora/collabora-deployment.yaml b/collabora/collabora-deployment.yaml
index 2c9de102..4a91df16 100644
--- a/collabora/collabora-deployment.yaml
+++ b/collabora/collabora-deployment.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: code
-        image: collabora/code:6.4.10.10
+        image: collabora/code:latest
         env:
         - name: extra_params
           value: --o:ssl.enable=false
diff --git a/collabora/collabora-secrets.yaml b/collabora/collabora-secrets.yaml
new file mode 100644
index 00000000..75be5d66
--- /dev/null
+++ b/collabora/collabora-secrets.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: collabora-secrets
+  namespace: collabora
+type: Opaque 
+stringData: 
+  db_password: Rey-1176 
+  app_key: 4VF2JAHT5PA9VCW7EUBUJCWAWV89G9PC
+  access_token: 4VF2JAHT5PA9VCW7EUBUJCWAWV89G9PC
+  mail_user: celestino_rey@ymail.com
+  mail_password: kbryvwxkockqckss
diff --git a/collabora/kustomization.yaml b/collabora/kustomization.yaml
index da687122..88d03e8a 100644
--- a/collabora/kustomization.yaml
+++ b/collabora/kustomization.yaml
@@ -6,6 +6,8 @@ secretGenerator:
   - db_user=root
   - db_passwd=Rey-1176
 resources:
+        #- collabora-secrets.yaml
 - pvc-collabora.yaml
+  #- mysql-deployment.yaml
 - nextcloud-deployment.yaml
 - collabora-deployment.yaml
diff --git a/collabora/mysql-deployment.yaml b/collabora/mysql-deployment.yaml
new file mode 100644
index 00000000..4c89cbc2
--- /dev/null
+++ b/collabora/mysql-deployment.yaml
@@ -0,0 +1,54 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: collabora-mysql
+  namespace: collabora
+  labels:
+    app: collabora
+spec:
+  ports:
+    - port: 3306
+  selector:
+    app: collabora
+    tier: mysql
+  clusterIP: None
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: collabora-mysql
+  namespace: collabora
+  labels:
+    app: collabora
+spec:
+  selector:
+    matchLabels:
+      app: collabora
+      tier: mysql
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: collabora
+        tier: mysql
+    spec:
+      containers:
+      - image: mysql:latest
+        name: mysql
+        env:
+        - name: MYSQL_ROOT_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: collabora-secrets
+              key: db_password
+        ports:
+        - containerPort: 3306
+          name: mysql
+        volumeMounts:
+        - name: mysql-persistent-storage
+          mountPath: /var/lib/mysql
+      volumes:
+      - name: mysql-persistent-storage
+        persistentVolumeClaim:
+          claimName: collabora-pv-claim