Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
355adff3
Commit
355adff3
authored
Jul 31, 2019
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
06a093ce
225795ce
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
78 additions
and
3 deletions
+78
-3
software/nextcloud/nextcloud-config.json.in
software/nextcloud/nextcloud-config.json.in
+40
-0
software/nextcloud/nextcloud-input-schema.json
software/nextcloud/nextcloud-input-schema.json
+5
-0
software/nextcloud/nextcloud-instance.cfg.in
software/nextcloud/nextcloud-instance.cfg.in
+25
-1
software/nextcloud/software.cfg
software/nextcloud/software.cfg
+8
-2
No files found.
software/nextcloud/nextcloud-config.json.in
0 → 100644
View file @
355adff3
{% set trusted_domain_list = [] -%}
{% set proxy_list = [] -%}
{% for trusted_domain in parameter_dict['trusted-domain-list'].split() -%}
{% if trusted_domain.strip() -%}
{% do trusted_domain_list.append(trusted_domain.strip()) -%}
{% endif -%}
{% endfor -%}
{% for proxy in parameter_dict['trusted-proxy-list'].strip().split(' ') -%}
{% if proxy -%}
{% do proxy_list.append(proxy) -%}
{% endif -%}
{% endfor -%}
{
"system": {
"overwrite.cli.url": "{{ parameter_dict['cli-url'] }}",
"trusted_domains": [
{% if len(trusted_domain_list) > 0 -%}
{{ ' "' ~ trusted_domain_list | join('",\n "') ~ '"' }}
{% endif -%}
],
"trusted_proxies": [
{% if len(proxy_list) > 0 -%}
{{ ' "' ~ proxy_list | join('",\n "') ~ '"' }}
{% endif -%}
],
"dbname": "{{ parameter_dict['db-name'] }}",
"dbhost": "{{ parameter_dict['db-host'] }}:{{ parameter_dict['db-port'] }}",
"mysql.utf8mb4": true,
"dbuser": "{{ parameter_dict['db-user'] }}",
"dbpassword": "{{ parameter_dict['db-password'] }}",
"redis": {
"host": "{{ parameter_dict['redis-socket'] }}",
"port": 0,
"timeout": 0
},
"logfile": "{{ parameter_dict['data-dir'] }}/nextcloud.log",
"datadirectory": "{{ parameter_dict['data-dir'] }}"
}
}
\ No newline at end of file
software/nextcloud/nextcloud-input-schema.json
View file @
355adff3
...
@@ -123,6 +123,11 @@
...
@@ -123,6 +123,11 @@
"title"
:
"Second authorized domain on nextcloud"
,
"title"
:
"Second authorized domain on nextcloud"
,
"description"
:
"Trusted domain used to connect to Nextcloud instance."
,
"description"
:
"Trusted domain used to connect to Nextcloud instance."
,
"type"
:
"string"
"type"
:
"string"
},
"instance.trusted-domain-3"
:
{
"title"
:
"Third authorized domain on nextcloud"
,
"description"
:
"Trusted domain used to connect to Nextcloud instance."
,
"type"
:
"string"
}
}
}
}
}
}
\ No newline at end of file
software/nextcloud/nextcloud-instance.cfg.in
View file @
355adff3
...
@@ -41,6 +41,8 @@ trusted-domain-list =
...
@@ -41,6 +41,8 @@ trusted-domain-list =
[${apache-php-configuration:ip}]:${apache-php-configuration:port}
[${apache-php-configuration:ip}]:${apache-php-configuration:port}
${slap-parameter:instance.trusted-domain-1}
${slap-parameter:instance.trusted-domain-1}
${slap-parameter:instance.trusted-domain-2}
${slap-parameter:instance.trusted-domain-2}
${slap-parameter:instance.trusted-domain-3}
trusted-proxy-list = ${slap-parameter:instance.trusted-proxy-list}
trusted-proxy-list = ${slap-parameter:instance.trusted-proxy-list}
cli-url = ${slap-parameter:instance.cli-url}
cli-url = ${slap-parameter:instance.cli-url}
data-dir = ${nc-directory:data}
data-dir = ${nc-directory:data}
...
@@ -86,6 +88,7 @@ depends =
...
@@ -86,6 +88,7 @@ depends =
${nextcloud-apache-httpd:recipe}
${nextcloud-apache-httpd:recipe}
${nextcloud-backup-cron:recipe}
${nextcloud-backup-cron:recipe}
${nextcloud-news-updater:recipe}
${nextcloud-news-updater:recipe}
${nextcloud-config-update:recipe}
[nextcloud-apache-httpd]
[nextcloud-apache-httpd]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -148,6 +151,26 @@ input = inline:#!/bin/sh
...
@@ -148,6 +151,26 @@ input = inline:#!/bin/sh
output = ${directory:scripts}/nextcloud-news-updater
output = ${directory:scripts}/nextcloud-news-updater
mode = 744
mode = 744
[nextcloud-config.json]
recipe = slapos.recipe.template:jinja2
template = {{ nextcloud_parameter_json }}
rendered = ${directory:etc}/nextcloud-config.json
extensions = jinja2.ext.do
context =
section parameter_dict instance-parameter
mode = 600
[nextcloud-config-update]
output = ${directory:scripts}/nextcloud-update
recipe = collective.recipe.template
input = inline:#!/bin/sh
if [ -f "${instance-parameter:nextcloud}/config/CAN_INSTALL" ]; then
# do not run this script if nextcloud is not installed yet.
exit 1;
fi
${php-bin:wrapper-path} ${instance-parameter:nextcloud}/occ config:import ${nextcloud-config.json:rendered}
mode = 744
[php-bin]
[php-bin]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/php
wrapper-path = ${directory:bin}/php
...
@@ -174,4 +197,5 @@ instance.turn-secret =
...
@@ -174,4 +197,5 @@ instance.turn-secret =
instance.cli-url = ${apache-php-configuration:url}
instance.cli-url = ${apache-php-configuration:url}
instance.trusted-domain-1 =
instance.trusted-domain-1 =
instance.trusted-domain-2 =
instance.trusted-domain-2 =
instance.trusted-domain-3 =
instance.trusted-proxy-list =
instance.trusted-proxy-list =
\ No newline at end of file
software/nextcloud/software.cfg
View file @
355adff3
...
@@ -26,12 +26,17 @@ md5sum = a2281f86f6a26a8ff40a57a495505977
...
@@ -26,12 +26,17 @@ md5sum = a2281f86f6a26a8ff40a57a495505977
filename = apache-httpd.conf.in
filename = apache-httpd.conf.in
md5sum = f3bca64bf991526fd8221035a86aacbf
md5sum = f3bca64bf991526fd8221035a86aacbf
[template-nextcloud-config.json]
<= nc-download-base
filename = nextcloud-config.json.in
md5sum = fbc5eacda192cb02c8d9861cb628fe6f
[template-nextcloud-instance]
[template-nextcloud-instance]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/nextcloud-instance.cfg.in
template = ${:_profile_base_location_}/nextcloud-instance.cfg.in
rendered = ${buildout:directory}/instance-nextcloud.cfg
rendered = ${buildout:directory}/instance-nextcloud.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
md5sum =
0dd3eea61be79135810b0c2286c520b5
md5sum =
5c721c7eb8a06147b849a65ba92becba
context =
context =
key gzip_location gzip:location
key gzip_location gzip:location
key python3_location python3.6.6:location
key python3_location python3.6.6:location
...
@@ -41,6 +46,7 @@ context =
...
@@ -41,6 +46,7 @@ context =
raw redis_cli ${redis:location}/bin/redis-cli
raw redis_cli ${redis:location}/bin/redis-cli
raw nextcloud_install_sh ${template-nextcloud-install.sh:location}/${template-nextcloud-install.sh:filename}
raw nextcloud_install_sh ${template-nextcloud-install.sh:location}/${template-nextcloud-install.sh:filename}
raw nextcloud_apache_httpd ${template-apache-httpd:location}/${template-apache-httpd:filename}
raw nextcloud_apache_httpd ${template-apache-httpd:location}/${template-apache-httpd:filename}
raw nextcloud_parameter_json ${template-nextcloud-config.json:location}/${template-nextcloud-config.json:filename}
[custom-application-deployment]
[custom-application-deployment]
path = ${template-nextcloud-instance:rendered}
path = ${template-nextcloud-instance:rendered}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment