diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index c331d0b..a7d2382 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -50,7 +50,7 @@
true
root connection to mariadb
org.mariadb.jdbc.Driver
- jdbc:mariadb://localhost:3306/
+ jdbc:mariadb://localhost:3307/
@@ -60,7 +60,7 @@
true
nextcloud connection to mariadb
org.mariadb.jdbc.Driver
- jdbc:mariadb://localhost:3306/
+ jdbc:mariadb://localhost:3307/
diff --git a/ansible-5/roles/prod.k3s/defaults/main.yml b/ansible-5/roles/prod.k3s/defaults/main.yml
index ebe271f..a9c1ffb 100644
--- a/ansible-5/roles/prod.k3s/defaults/main.yml
+++ b/ansible-5/roles/prod.k3s/defaults/main.yml
@@ -70,4 +70,5 @@ apps:
nextcloud:
enabled: true
namespace: nextcloud
- state: absent
+ state: present
+
diff --git a/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml b/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml
index d0539dd..4c82e35 100644
--- a/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml
+++ b/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml
@@ -1,8 +1,8 @@
---
-image:
+#image:
# repository: dkregistry.xai-corp.net
- tag: "21.0"
+# tag: "21.0"
# flavor: apache
# pullSecrets: regcred
@@ -20,68 +20,134 @@ ingress:
nextcloud:
# image: xaicorp/nextcloud
host: xaibox.xai-corp.net
- datadir: /var/www/html/data
- defaultConfigs:
- autoconfig\.php: false
+# datadir: /opt/nextcloud_data
+
+ #database users
+ username: nextcloud_admin
+ password: '1nd80h%!0CH3189H1G'
+
+# defaultConfigs:
+# autoconfig\.php: true
+# phpConfigs:
+# memory.ini: |-
+
configs:
- config.php: |-
+# installed.config.php: |-
+# 'https',
+# ];
+ installed.config.php: |-
true,
- 'instanceid' => 'ocxziwl6co38',
- 'passwordsalt' => 'FKWh+oXeNAm2EPHg6mz+9xE48gunGb',
- 'secret' => 'yC3EEMk31oZpas8U65awdT5rxR40+8uP5NEkD82S3iLNNWqr',
+ 'installed' => false,
+ 'instanceid' => 'ocdt5et0qmad',
+ 'passwordsalt' => 'r9q0q/rh+zVick0gTc/0T2/37oNwQo',
+ 'secret' => 'Rwl+It4J/0GK/6VL51sCiZ2ajpOwAPsnO61v6iN7TGmdSpAQ',
'trusted_domains' => [
- 0 => 'dkhost.xai-corp.net:8083',
- 1 => 'dkhost:8083',
- 2 => 'tasks.xaibox_app:8083',
- 3 => 'xaibox.xai-corp.net',
- 4 => 'localhost',
+ 0 => 'localhost',
+ 1 => 'xaibox.xai-corp.net',
],
- 'htaccess.RewriteBase' => '/',
- 'memcache.local' => '\\OC\\Memcache\\APCu',
- 'apps_paths' => [
- 0 => [
- 'path' => '/var/www/html/apps',
- 'url' => '/apps',
- 'writable' => false,
- ],
- 1 => [
- 'path' => '/var/www/html/custom_apps',
- 'url' => '/custom_apps',
- 'writable' => true,
- ],
- ],
- 'datadirectory' => '/var/www/html/data',
- 'dbtype' => 'mysql',
- 'dbname' => 'nextcloud',
- 'dbhost' => 'mariadb.mariadb',
- 'dbport' => '3306',
- 'dbtableprefix' => 'oc_',
- 'mysql.utf8mb4' => true,
- 'dbuser' => 'nextcloud',
- 'dbpassword' => 'xh891hx1hc89f239hibndnxc1i',
-
- 'version' => '21.0.9.1',
- 'overwrite.cli.url' => 'http://localhost',
- 'log_type' => 'owncloud',
- 'logfile' => 'nextcloud.log'
+ 'overwriteprotocol' => 'https',
];
+# config.extra.php: |-
+# '/',
+# 'memcache.local' => '\\OC\\Memcache\\APCu',
+# 'apps_paths' =>
+# array (
+# 0 =>
+# array (
+# 'path' => '/var/www/html/apps',
+# 'url' => '/apps',
+# 'writable' => false,
+# ),
+# 1 =>
+# array (
+# 'path' => '/var/www/html/custom_apps',
+# 'url' => '/custom_apps',
+# 'writable' => true,
+# ),
+# ),
+# 'passwordsalt' => 'NvqZk5+08qEUyqoPaviiSJLlkNUfe8',
+# 'secret' => 'KLDLyvB1UbXhV4KVD1Rp9tY3hI9IBN3HNG9qc2XWmR6jGWaK',
+# 'trusted_domains' =>
+# array (
+# 0 => 'xaibox.xai-corp.net',
+# ),
+# 'datadirectory' => '/var/www/html/data',
+# 'dbtype' => 'mysql',
+# 'version' => '25.0.1.1',
+# 'overwrite.cli.url' => 'http://localhost',
+# 'dbname' => 'nextcloud',
+# 'dbhost' => 'mariadb.mariadb:3306',
+# 'dbport' => '',
+# 'dbtableprefix' => 'oc_',
+# 'mysql.utf8mb4' => true,
+# 'dbuser' => 'nextcloud',
+# 'dbpassword' => 'xh891hx1hc89f239hibndnxc1i',
+# 'instanceid' => 'ocs4oenczl28',
+# 'config_is_read_only' => false,
+# );
+# true,
+# 'instanceid' => 'ocxziwl6co38',
+# 'passwordsalt' => 'FKWh+oXeNAm2EPHg6mz+9xE48gunGb',
+# 'secret' => 'yC3EEMk31oZpas8U65awdT5rxR40+8uP5NEkD82S3iLNNWqr',
+# 'trusted_domains' => [
+# 0 => 'dkhost.xai-corp.net:8083',
+# 1 => 'dkhost:8083',
+# 2 => 'tasks.xaibox_app:8083',
+# 3 => 'xaibox.xai-corp.net',
+# 4 => 'localhost',
+# ],
+# 'htaccess.RewriteBase' => '/',
+# 'memcache.local' => '\\OC\\Memcache\\APCu',
+# 'apps_paths' => [
+# 0 => [
+# 'path' => '/var/www/html/apps',
+# 'url' => '/apps',
+# 'writable' => false,
+# ],
+# 1 => [
+# 'path' => '/var/www/html/custom_apps',
+# 'url' => '/custom_apps',
+# 'writable' => true,
+# ],
+# ],
+# 'datadirectory' => '/var/www/html/data',
+# 'dbtype' => 'mysql',
+# 'dbname' => 'nextcloud',
+# 'dbhost' => 'mariadb.mariadb',
+# 'dbport' => '3306',
+# 'dbtableprefix' => 'oc_',
+# 'mysql.utf8mb4' => true,
+# 'dbuser' => 'nextcloud',
+# 'dbpassword' => 'xh891hx1hc89f239hibndnxc1i',
+#
+# 'version' => '21.0.9.1',
+# 'overwrite.cli.url' => 'http://localhost',
+# 'log_type' => 'owncloud',
+# 'logfile' => 'nextcloud.log'
+# ];
-# extraVars:
+ extraVars:
+ PHP_MEMORY_LIMIT: -1
# ServerName: xaibox.xai-corp.net
#
- extraVolumes:
- - name: extra-data
- persistentVolumeClaim:
- claimName: nextcloud-data-0
- - name: extra-apps
- persistentVolumeClaim:
- claimName: nextcloud-apps-0
+# extraVolumes:
+# - name: extra-data
+# persistentVolumeClaim:
+# claimName: nextcloud-data-0
+# - name: extra-apps
+# persistentVolumeClaim:
+# claimName: nextcloud-apps-0
# volumeMounts:
# - name: extra-data
-# mountPath: /data
+# mountPath: /opt/nextcloud
# - name: extra-apps
# mountPath: /apps
@@ -104,10 +170,10 @@ internalDatabase:
externalDatabase:
enabled: true
type: mysql
- host: "sql.xai-corp.net:3306"
- database: nextcloud2
- user: nextcloud
- password: xh891hx1hc89f239hibndnxc1i
+ host: "mariadb.mariadb:3306"
+ database: nextcloud2022
+ user: root
+ password: q4890qhhfgq9pfg3q4uyg33
redis:
- enabled: false
+ enabled: true
diff --git a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml
index d52058a..c5f1bd9 100644
--- a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml
+++ b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml
@@ -13,5 +13,5 @@ spec:
accessModes:
- ReadWriteOnce
hostPath:
- path: "/opt/data/nextcloud2/data"
+ path: "/opt/data/nextcloud/2022/data"
diff --git a/dockerfiles/services/services/mariadb/docker-compose.yml b/dockerfiles/services/services/mariadb/docker-compose.yml
index 44ba117..3e44c9f 100644
--- a/dockerfiles/services/services/mariadb/docker-compose.yml
+++ b/dockerfiles/services/services/mariadb/docker-compose.yml
@@ -9,7 +9,7 @@ services:
mysql:
image: "mariadb:10.5"
volumes:
- - /opt/data/mariadb/data:/var/lib/mysql
+ - /opt/data/shared/mariadb/data:/var/lib/mysql
# - /opt/mariadb/data:/var/lib/mysql
ports:
- "3306:3306"