From 6aeb48b958d1bf7c12841db63e16c0acf0fc2aa2 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 14 Jul 2023 08:08:58 +0200
Subject: [PATCH] refs #5975 Production setup changes

---
 mbrs/docker-compose-build.yml                 |  31 ----------
 mbrs/kubernetes/secrets.yml                   |  58 ------------------
 {mbrs => mrbs}/Dockerfile                     |   2 +-
 .../mbrs.yml => mrbs/kube-compose.yml         |  34 +++++++---
 {mbrs => mrbs}/tables.my.sql                  |   0
 .../themes}/verdnatura/footer.inc             |   0
 .../themes}/verdnatura/header.inc             |   0
 .../themes}/verdnatura/styling.inc            |   0
 {mbrs => mrbs}/vernatura-logo.png             | Bin
 9 files changed, 25 insertions(+), 100 deletions(-)
 delete mode 100644 mbrs/docker-compose-build.yml
 delete mode 100644 mbrs/kubernetes/secrets.yml
 rename {mbrs => mrbs}/Dockerfile (95%)
 rename mbrs/kubernetes/mbrs.yml => mrbs/kube-compose.yml (80%)
 rename {mbrs => mrbs}/tables.my.sql (100%)
 rename {mbrs/Themes => mrbs/themes}/verdnatura/footer.inc (100%)
 rename {mbrs/Themes => mrbs/themes}/verdnatura/header.inc (100%)
 rename {mbrs/Themes => mrbs/themes}/verdnatura/styling.inc (100%)
 rename {mbrs => mrbs}/vernatura-logo.png (100%)

diff --git a/mbrs/docker-compose-build.yml b/mbrs/docker-compose-build.yml
deleted file mode 100644
index 365e9e4..0000000
--- a/mbrs/docker-compose-build.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: "3.1"
-services:
-    web:
-        build:
-            context: .
-        container_name: mrbs-web
-        ports: 
-            - "8080:80"
-            
-        links:
-            - db
-        networks:
-            - default
-    db:
-        image: mysql:8.0.33
-        container_name: mrbs-db
-        ports: 
-            - "3306:3306"
-        command: --default-authentication-plugin=mysql_native_password
-        environment:
-            MYSQL_DATABASE: mrbs 
-            MYSQL_USER: mrbs
-            MYSQL_PASSWORD: dhFtyr6%3jfifjRL.F987?
-            MYSQL_ROOT_PASSWORD: 3TTEKrPXspMAvHp
-            
-        volumes:
-            - ./tables.my.sql:/docker-entrypoint-initdb.d/010-tables.sql
-            - ./db:/var/lib/mysql
-        networks:
-            - default
-
diff --git a/mbrs/kubernetes/secrets.yml b/mbrs/kubernetes/secrets.yml
deleted file mode 100644
index 0e542df..0000000
--- a/mbrs/kubernetes/secrets.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mbrs.env
-  labels:
-    app: mbrs
-type: Opaque
-stringData:
-  MYSQL_PASSWORD: dhFtyr6%3jfifjRL.F987?
-  MYSQL_ROOT_PASSWORD: 3TTEKrPXspMAvHp
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mbrs.config
-  labels:
-    app: mbrs
-type: Opaque
-stringData:
-  config.inc.php: |
-    <?php
-    
-    $debug = true;
-    $timezone = "Europe/Madrid";
-    $mrbs_admin = "Your Administrator";
-    $mrbs_admin_email = "admin_email@your.org";
-    $mrbs_company_logo = "vernatura-logo.png";
-    $mrbs_company = "";
-    //$mrbs_company_url = "https://www.verdnatura.es/";
-    $weekstarts = 1;
-
-    $dbsys = "mysql";
-    $db_host = "mrbs-db";
-    $db_database = "mrbs";
-    $db_login = "mrbs";
-    $db_password = 'dhFtyr6%3jfifjRL.F987?';
-    $db_tbl_prefix = "mrbs_";
-
-    $theme = "verdnatura";
-
-    $auth["type"] = "ldap"; 
-
-    $ldap_host = "ldap://ldap.verdnatura.es";
-    $ldap_v3 = true;
-    $ldap_tls = false;
-    $ldap_base_dn = "dc=verdnatura,dc=es";
-    $ldap_user_attrib = "uid";
-    $ldap_dn_search_attrib = "uid";
-    $ldap_dn_search_dn = "cn=mrbs,ou=admins,dc=verdnatura,dc=es";
-    $ldap_get_user_email = false;
-    $ldap_email_attrib = 'mail';
-    $ldap_name_attrib = 'cn';
-    $ldap_admin_group_dn = 'cn=sysadmin,ou=dnGroups,dc=verdnatura,dc=es';
-    $ldap_group_member_attrib = 'memberof';
-    $ldap_debug = true;
-    $ldap_debug_attributes = true;
-
-    $auth['deny_public_access'] = true;
diff --git a/mbrs/Dockerfile b/mrbs/Dockerfile
similarity index 95%
rename from mbrs/Dockerfile
rename to mrbs/Dockerfile
index 92e8003..d623278 100644
--- a/mbrs/Dockerfile
+++ b/mrbs/Dockerfile
@@ -27,6 +27,6 @@ RUN \
 
 RUN docker-php-ext-install mysqli pdo pdo_mysql ldap intl gd
 
-COPY Themes/verdnatura /var/www/html/web/Themes
+COPY themes/verdnatura /var/www/html/web/Themes
    
 
diff --git a/mbrs/kubernetes/mbrs.yml b/mrbs/kube-compose.yml
similarity index 80%
rename from mbrs/kubernetes/mbrs.yml
rename to mrbs/kube-compose.yml
index 591bd96..7b12529 100644
--- a/mbrs/kubernetes/mbrs.yml
+++ b/mrbs/kube-compose.yml
@@ -50,8 +50,8 @@ spec:
         app: mrbs
     spec:
       containers:
-        - image: registry.verdnatura.es/mbrs:1.11.1-vn1
-   ##       name: main ???
+        - image: registry.verdnatura.es/mrbs:1.11.2-vn1
+          name: main
           ports:
             - containerPort: 80
           resources:
@@ -62,10 +62,12 @@ spec:
               mountPath: /var/www/html/web/config.inc.php
               subPath: config.inc.php
       restartPolicy: Always
+      imagePullSecrets:
+        - name: regcred
       volumes:
         - name: secret
           secret:
-            secretName: mbrs.config
+            secretName: mrbs.config
             defaultMode: 420
 ---
 apiVersion: v1
@@ -87,7 +89,7 @@ kind: Deployment
 metadata:
   name: mrbs.db
   labels:
-    app: mrbs-db
+    app: mrbs
 spec:
   replicas: 1
   selector:
@@ -98,11 +100,10 @@ spec:
   template:
     metadata:
       labels:
-        app: mrbs
         io.kompose.service: mrbs-db
     spec:
       containers:
-        - image: mysql:8.0.33
+        - image: mariadb:10.11.4
           name: mrbs-db
           args:
             - --transaction-isolation=READ-COMMITTED
@@ -118,6 +119,11 @@ spec:
                 secretKeyRef:
                   name: mrbs.env
                   key: MYSQL_PASSWORD
+            - name: MYSQL_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mrbs.env
+                  key: MYSQL_ROOT_PASSWORD
           ports:
             - containerPort: 3306
           resources:
@@ -125,25 +131,33 @@ spec:
               memory: 500Mi
           volumeMounts:
             - mountPath: /var/lib/mysql
-              name: mrbs-db
+              name: db
+            - mountPath: /etc/localtime
+              name: localtime
+              readOnly: true
       restartPolicy: Always
       volumes:
         - name: db
           persistentVolumeClaim:
             claimName: mrbs.db
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
+            type: File
+            readOnly: true
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: mrbs.db
   labels:
-    app: mrdb-db
+    app: mrdb
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 4Gi
+      storage: 2Gi
   storageClassName: csi-rbd-ssd-sc
   volumeMode: Filesystem
 ---
@@ -159,5 +173,5 @@ spec:
   volumeMode: Filesystem
   resources:
     requests:
-      storage: 4Gi
+      storage: 500Mi
   storageClassName: csi-rbd-ssd-sc
diff --git a/mbrs/tables.my.sql b/mrbs/tables.my.sql
similarity index 100%
rename from mbrs/tables.my.sql
rename to mrbs/tables.my.sql
diff --git a/mbrs/Themes/verdnatura/footer.inc b/mrbs/themes/verdnatura/footer.inc
similarity index 100%
rename from mbrs/Themes/verdnatura/footer.inc
rename to mrbs/themes/verdnatura/footer.inc
diff --git a/mbrs/Themes/verdnatura/header.inc b/mrbs/themes/verdnatura/header.inc
similarity index 100%
rename from mbrs/Themes/verdnatura/header.inc
rename to mrbs/themes/verdnatura/header.inc
diff --git a/mbrs/Themes/verdnatura/styling.inc b/mrbs/themes/verdnatura/styling.inc
similarity index 100%
rename from mbrs/Themes/verdnatura/styling.inc
rename to mrbs/themes/verdnatura/styling.inc
diff --git a/mbrs/vernatura-logo.png b/mrbs/vernatura-logo.png
similarity index 100%
rename from mbrs/vernatura-logo.png
rename to mrbs/vernatura-logo.png