Use MySQL for initial setup

SynoCommunity · Sep 21, 2024 · 9454ffb · 9454ffb
1 parent 3a49801
commit 9454ffb
Show file tree

Hide file tree

Showing 14 changed files with 301 additions and 177 deletions.
diff --git a/spk/owncloud/Makefile b/spk/owncloud/Makefile
@@ -8,7 +8,7 @@ DEPENDS = cross/owncloud
 override ARCH=
 
 REQUIRED_MIN_DSM = 6.0
-SPK_DEPENDS = WebStation:PHP7.4:Apache2.4
+SPK_DEPENDS = WebStation:PHP7.4:MariaDB10:Apache2.4:redis
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = ownCloud is a personal cloud which runs on your own server and gives you freedom and control over your own data.

diff --git a/spk/owncloud/src/conf/resource b/spk/owncloud/src/conf/resource
@@ -1,4 +1,22 @@
 {
+    "mariadb10-db": {
+        "admin-account-m10": "root",
+        "admin-pw-m10": "{{wizard_mysql_password_root}}",
+        "create-db": {
+            "db-collision": "skip",
+            "db-name": "{{wizard_mysql_name_db}}",
+            "flag": "{{wizard_mysql_create_db}}"
+        },
+        "drop-db-uninst": true,
+        "drop-user-uninst": true,
+        "grant-user": {
+            "db-name": "{{wizard_mysql_name_db}}",
+            "flag": "{{wizard_mysql_grant_user}}",
+            "host": "localhost",
+            "user-name": "{{wizard_mysql_name_user}}",
+            "user-pw": "{{wizard_mysql_password_user}}"
+        }
+    },
 	"webservice": {
 		"migrate": {
 			"root": [{
@@ -40,17 +58,13 @@
 					"intl",
 					"ldap",
 					"openssl",
-					"pdo_sqlite",
-					"sqlite3",
+					"pdo_mysql",
+					"redis",
 					"ssh2",
 					"zip",
 					"zlib"
 				],
 				"group": "http",
-				"php_settings": {
-					"error_log": "/var/services/web_packages/owncloud/php_errors.log",
-					"max_execution_time": "900"
-				},
 				"profile_desc": "PHP Profile for ownCloud",
 				"profile_name": "ownCloud Profile",
 				"user": "sc-owncloud"

diff --git a/spk/owncloud/src/conf_6/resource b/spk/owncloud/src/conf_6/resource
@@ -1,4 +1,22 @@
 {
+    "mariadb10-db": {
+        "admin-account-m10": "root",
+        "admin-pw-m10": "{{wizard_mysql_password_root}}",
+        "create-db": {
+            "db-collision": "skip",
+            "db-name": "{{wizard_mysql_name_db}}",
+            "flag": "{{wizard_mysql_create_db}}"
+        },
+        "drop-db-uninst": true,
+        "drop-user-uninst": true,
+        "grant-user": {
+            "db-name": "{{wizard_mysql_name_db}}",
+            "flag": "{{wizard_mysql_grant_user}}",
+            "host": "localhost",
+            "user-name": "{{wizard_mysql_name_user}}",
+            "user-pw": "{{wizard_mysql_password_user}}"
+        }
+    },
 	"data-share": {
 		"shares": [{
 			"name": "{{wizard_data_share}}",