Merge pull request #3589 from wkloucek/config-env

[full-ci] config env

.drone.star

@@ -44,17 +44,34 @@ config = {
     "modules": [
         # if you add a module here please also add it to the root level Makefile
         "extensions/accounts",
+        "extensions/app-registry",
+        "extensions/appprovider",
         "extensions/audit",
+        "extensions/auth-basic",
+        "extensions/auth-bearer",
+        "extensions/auth-machine",
+        "extensions/frontend",
+        "extensions/gateway",
         "extensions/glauth",
         "extensions/graph-explorer",
         "extensions/graph",
+        "extensions/group",
+        "extensions/idm",
         "extensions/idp",
+        "extensions/nats",
+        "extensions/notifications",
+        "extensions/ocdav",
         "extensions/ocs",
         "extensions/proxy",
         "extensions/settings",
-        "extensions/storage",
+        "extensions/sharing",
+        "extensions/storage-metadata",
+        "extensions/storage-publiclink",
+        "extensions/storage-shares",
+        "extensions/storage-users",
         "extensions/store",
         "extensions/thumbnails",
+        "extensions/user",
         "extensions/web",
         "extensions/webdav",
         "ocis-pkg",
@@ -1687,25 +1704,21 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             "LDAP_LOGIN_ATTRIBUTES": "uid,mail",
             # ownCloudSQL storage driver
             "STORAGE_USERS_DRIVER": "owncloudsql",
-            "STORAGE_METADATA_DRIVER": "ocis",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR": "/mnt/data/files",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR": "/tmp",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_SHARE_FOLDER": "/Shares",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_LAYOUT": "{{.Username}}",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBUSERNAME": "owncloud",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPASSWORD": "owncloud",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBHOST": "oc10-db",
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT": 3306,
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME": "owncloud",
-            # TODO: redis is not yet supported
-            "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379",
+            "STORAGE_USERS_OWNCLOUDSQL_DATADIR": "/mnt/data/files",
+            "STORAGE_USERS_OWNCLOUDSQL_SHARE_FOLDER": "/Shares",
+            "STORAGE_USERS_OWNCLOUDSQL_LAYOUT": "{{.Username}}",
+            "STORAGE_USERS_OWNCLOUDSQL_DB_USERNAME": "owncloud",
+            "STORAGE_USERS_OWNCLOUDSQL_DB_PASSWORD": "owncloud",
+            "STORAGE_USERS_OWNCLOUDSQL_DB_HOST": "oc10-db",
+            "STORAGE_USERS_OWNCLOUDSQL_DB_PORT": 3306,
+            "STORAGE_USERS_OWNCLOUDSQL_DB_NAME": "owncloud",
             # ownCloudSQL sharing driver
             "SHARING_USER_DRIVER": "owncloudsql",
-            "SHARING_USER_SQL_USERNAME": "owncloud",
-            "SHARING_USER_SQL_PASSWORD": "owncloud",
-            "SHARING_USER_SQL_HOST": "oc10-db",
-            "SHARING_USER_SQL_PORT": 3306,
-            "SHARING_USER_SQL_NAME": "owncloud",
+            "SHARING_USER_OWNCLOUDSQL_DB_USERNAME": "owncloud",
+            "SHARING_USER_OWNCLOUDSQL_DB_PASSWORD": "owncloud",
+            "SHARING_USER_OWNCLOUDSQL_DB_HOST": "oc10-db",
+            "SHARING_USER_OWNCLOUDSQL_DB_PORT": 3306,
+            "SHARING_USER_OWNCLOUDSQL_DB_NAME": "owncloud",
             # General oCIS config
             # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
             "OCIS_RUN_EXTENSIONS": "settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,appprovider,sharing,proxy,nats,ocdav",
@@ -2463,6 +2476,7 @@ def copyConfigs():
             # ocis proxy config
             "mkdir -p /etc/ocis",
             "cp %s/ocis/proxy.yaml /etc/ocis/proxy.yaml" % (PARALLEL_DEPLOY_CONFIG_PATH),
+            "chown -R 33:33 /etc/ocis",
             # oc10 configs
             "mkdir -p /etc/templates",
             "mkdir -p /etc/pre_server.d",

Makefile

@@ -17,17 +17,34 @@ L10N_MODULES := $(shell find . -path '*.tx*' -name 'config' | sed 's|/[^/]*$$||'
 # if you add a module here please also add it to the .drone.star file
 OCIS_MODULES = \
 	extensions/accounts \
+	extensions/app-registry \
+	extensions/appprovider \
 	extensions/audit \
+	extensions/auth-basic \
+	extensions/auth-bearer \
+	extensions/auth-machine \
+	extensions/frontend \
+	extensions/gateway \
 	extensions/glauth \
 	extensions/graph \
 	extensions/graph-explorer \
+	extensions/group \
+	extensions/idm \
 	extensions/idp \
+	extensions/nats \
+	extensions/notifications \
+	extensions/ocdav \
 	extensions/ocs \
 	extensions/proxy \
 	extensions/settings \
-	extensions/storage \
+	extensions/sharing \
+	extensions/storage-metadata \
+	extensions/storage-publiclink \
+	extensions/storage-shares \
+	extensions/storage-users \
 	extensions/store \
 	extensions/thumbnails \
+	extensions/user \
 	extensions/web \
 	extensions/webdav\
 	ocis \
@@ -111,7 +128,7 @@ composer.lock: composer.json
 .PHONY: generate
 generate:
 	@for mod in $(OCIS_MODULES); do \
-        $(MAKE) --no-print-directory -C $$mod generate || exit 1; \
+        $(MAKE) -C $$mod generate || exit 1; \
     done
 
 .PHONY: vet

docs/extensions/app-registry/_index.md

@@ -0,0 +1,16 @@
+---
+title: App Registry
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/app-registry
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/extensions/storage/apps.md → docs/extensions/app-registry/apps.md

@@ -3,7 +3,7 @@ title: "Apps"
 date: 2018-05-02T00:00:00+00:00
 weight: 10
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/storage
+geekdocEditPath: edit/master/docs/extensions/appprovider
 geekdocFilePath: apps.md
 ---
 

docs/extensions/app-registry/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/app-registry
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/app-registry-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/app-registry_configvars.md" >}}

docs/extensions/appprovider/_index.md

@@ -0,0 +1,16 @@
+---
+title: App Provider
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/appprovider
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/extensions/appprovider/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/appprovider
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/appprovider-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/appprovider_configvars.md" >}}

docs/extensions/auth-basic/_index.md

@@ -0,0 +1,16 @@
+---
+title: Auth-Basic
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/auth-basic
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/extensions/auth-basic/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/auth-basic
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/auth-basic-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/auth-basic_configvars.md" >}}

docs/extensions/auth-bearer/_index.md

@@ -0,0 +1,16 @@
+---
+title: Auth-Bearer
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/auth-bearer
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/extensions/auth-bearer/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/auth-bearer
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/auth-bearer-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/auth-bearer_configvars.md" >}}

docs/extensions/auth-machine/_index.md

@@ -0,0 +1,16 @@
+---
+title: Auth-Machine
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/auth-machine
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/extensions/auth-machine/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/auth-machine
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/auth-machine-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/auth-machine_configvars.md" >}}

docs/extensions/frontend/_index.md

@@ -0,0 +1,16 @@
+---
+title: Frontend
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/frontend
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/extensions/frontend/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/frontend
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/frontend-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/frontend_configvars.md" >}}

docs/extensions/gateway/_index.md

@@ -0,0 +1,16 @@
+---
+title: Gateway
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/gateway
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}

docs/extensions/gateway/configuration.md

@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/gateway
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/gateway-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/gateway_configvars.md" >}}

docs/extensions/group/_index.md

@@ -0,0 +1,16 @@
+---
+title: Group
+date: 2022-03-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/group
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+## Abstract
+
+
+## Table of Contents
+
+{{< toc-tree >}}