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
36759a5d
Commit
36759a5d
authored
May 13, 2022
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nextcloud: upgrade to version 23
parent
0023971b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
28 deletions
+36
-28
software/nextcloud/buildout.hash.cfg
software/nextcloud/buildout.hash.cfg
+2
-2
software/nextcloud/nextcloud-install.sh.in
software/nextcloud/nextcloud-install.sh.in
+6
-6
software/nextcloud/nextcloud-instance.cfg.in
software/nextcloud/nextcloud-instance.cfg.in
+9
-1
software/nextcloud/software.cfg
software/nextcloud/software.cfg
+17
-17
stack/lamp/buildout.hash.cfg
stack/lamp/buildout.hash.cfg
+1
-1
stack/lamp/php.ini.in
stack/lamp/php.ini.in
+1
-1
No files found.
software/nextcloud/buildout.hash.cfg
View file @
36759a5d
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[template-nextcloud-install.sh]
[template-nextcloud-install.sh]
filename = nextcloud-install.sh.in
filename = nextcloud-install.sh.in
md5sum =
094c26b177fdde69b41d81b89bab542b
md5sum =
344aecea420021fa9c160f7ef73daa58
[template-apache-httpd]
[template-apache-httpd]
filename = apache-httpd.conf.in
filename = apache-httpd.conf.in
...
@@ -26,4 +26,4 @@ md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
...
@@ -26,4 +26,4 @@ md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
[template-nextcloud-instance]
[template-nextcloud-instance]
filename = nextcloud-instance.cfg.in
filename = nextcloud-instance.cfg.in
md5sum =
004e4bdfc49c7faee975343b6fece75c
md5sum =
7ff89fcaaf22a5fc26cd9745354e62ea
software/nextcloud/nextcloud-install.sh.in
View file @
36759a5d
...
@@ -52,7 +52,7 @@ cat <<EOF >> {{ parameter_dict['nextcloud'] }}/config/config.php
...
@@ -52,7 +52,7 @@ cat <<EOF >> {{ parameter_dict['nextcloud'] }}/config/config.php
'mail_smtppassword' => '{{ parameter_dict["mail.smtppassword"] }}',
'mail_smtppassword' => '{{ parameter_dict["mail.smtppassword"] }}',
'activity_expire_days' => 14,
'activity_expire_days' => 14,
'auth.bruteforce.protection.enabled' => true,
'auth.bruteforce.protection.enabled' => true,
'forwarded_for_headers' =>
'forwarded_for_headers' =>
array (
array (
0 => 'HTTP_X_FORWARDED',
0 => 'HTTP_X_FORWARDED',
),
),
...
@@ -67,13 +67,13 @@ array (
...
@@ -67,13 +67,13 @@ array (
{% endfor -%}
{% endfor -%}
),
),
{% endif -%}
{% endif -%}
'blacklisted_files' =>
'blacklisted_files' =>
array (
array (
0 => '.htaccess',
0 => '.htaccess',
1 => 'Thumbs.db',
1 => 'Thumbs.db',
2 => 'thumbs.db',
2 => 'thumbs.db',
),
),
'csrf.optout' =>
'csrf.optout' =>
array (
array (
0 => '/^WebDAVFS/',
0 => '/^WebDAVFS/',
1 => '/^Microsoft-WebDAV-MiniRedir/',
1 => '/^Microsoft-WebDAV-MiniRedir/',
...
@@ -81,7 +81,7 @@ array (
...
@@ -81,7 +81,7 @@ array (
),
),
'cron_log' => true,
'cron_log' => true,
'enable_previews' => true,
'enable_previews' => true,
'enabledPreviewProviders' =>
'enabledPreviewProviders' =>
array (
array (
0 => 'OC
\\
Preview
\\
PNG',
0 => 'OC
\\
Preview
\\
PNG',
1 => 'OC
\\
Preview
\\
JPEG',
1 => 'OC
\\
Preview
\\
JPEG',
...
@@ -110,7 +110,7 @@ array (
...
@@ -110,7 +110,7 @@ array (
'preview_max_x' => 1024,
'preview_max_x' => 1024,
'preview_max_y' => 768,
'preview_max_y' => 768,
'preview_max_scale_factor' => 1,
'preview_max_scale_factor' => 1,
'redis' =>
'redis' =>
array (
array (
'host' => '{{ parameter_dict["redis-socket"] }}',
'host' => '{{ parameter_dict["redis-socket"] }}',
'port' => 0,
'port' => 0,
...
@@ -134,7 +134,7 @@ EOF
...
@@ -134,7 +134,7 @@ EOF
php_cmd
{{
parameter_dict[
'nextcloud'
]
}}
/occ config:app:set richdocuments wopi_url
--value
=
"{{ parameter_dict.get('collabora-url', '') }}"
php_cmd
{{
parameter_dict[
'nextcloud'
]
}}
/occ config:app:set richdocuments wopi_url
--value
=
"{{ parameter_dict.get('collabora-url', '') }}"
php_cmd
{{
parameter_dict[
'nextcloud'
]
}}
/occ config:app:set spreed stun_servers
--value
=
"[
\"
{{ parameter_dict['stun-server'] }}
\"
]"
php_cmd
{{
parameter_dict[
'nextcloud'
]
}}
/occ config:app:set spreed stun_servers
--value
=
"[
\"
{{ parameter_dict['stun-server'] }}
\"
]"
php_cmd
{{
parameter_dict[
'nextcloud'
]
}}
/occ config:app:set spreed turn_servers
--value
=
"[{
\"
server
\"
:
\"
{{ parameter_dict['turn-server'] }}
\"
,
\"
secret
\"
:
\"
{{ parameter_dict['turn-secret'] }}
\"
,
\"
protocols
\"
:
\"
udp,tcp
\"
}]"
php_cmd
{{
parameter_dict[
'nextcloud'
]
}}
/occ config:app:set spreed turn_servers
--value
=
"[{
\"
server
\"
:
\"
{{ parameter_dict['turn-server'] }}
\"
,
\"
secret
\"
:
\"
{{ parameter_dict['turn-secret'] }}
\"
,
\"
protocols
\"
:
\"
udp,tcp
\"
}]"
sed
-i
's#useCronUpdates\s*=.*#useCronUpdates = false#g'
{{
parameter_dict[
'data-dir'
]
}}
/news/config/config.ini
php_cmd
{{
parameter_dict[
'nextcloud'
]
}}
/occ config:app:set news useCronUpdates
--value
=
''
if
[
-f
"{{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL"
]
;
then
if
[
-f
"{{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL"
]
;
then
rm
{{
parameter_dict[
'nextcloud'
]
}}
/config/CAN_INSTALL
rm
{{
parameter_dict[
'nextcloud'
]
}}
/config/CAN_INSTALL
...
...
software/nextcloud/nextcloud-instance.cfg.in
View file @
36759a5d
...
@@ -62,6 +62,7 @@ php.max_execution_time = 1800
...
@@ -62,6 +62,7 @@ php.max_execution_time = 1800
php.max_input_time = 3600
php.max_input_time = 3600
php.output_buffering = 'Off'
php.output_buffering = 'Off'
php.max_file_uploads = 100
php.max_file_uploads = 100
php.apc.enable_cli = 1
#SMTP settings
#SMTP settings
mail.from = ${slap-parameter:instance.mail-from}
mail.from = ${slap-parameter:instance.mail-from}
...
@@ -81,10 +82,17 @@ turn-secret = ${slap-parameter:instance.turn-secret}
...
@@ -81,10 +82,17 @@ turn-secret = ${slap-parameter:instance.turn-secret}
[nextcloud-install.sh]
[nextcloud-install.sh]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
url = {{ nextcloud_install_sh }}
url = {{ nextcloud_install_sh }}
output = ${directory:
scripts
}/nextcloud-install
output = ${directory:
bin
}/nextcloud-install
context =
context =
section parameter_dict instance-parameter
section parameter_dict instance-parameter
section nextcloud_apps nextcloud-apps
section nextcloud_apps nextcloud-apps
[nextcloud-install]
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:scripts}/nextcloud-install
command-line = ${nextcloud-install.sh:output}
wait-for-files =
${service-redis:unixsocket}
depends =
depends =
${service-redis:recipe}
${service-redis:recipe}
${redis-promise:recipe}
${redis-promise:recipe}
...
...
software/nextcloud/software.cfg
View file @
36759a5d
...
@@ -9,10 +9,10 @@ recipe = slapos.recipe.build:download
...
@@ -9,10 +9,10 @@ recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
[application]
[application]
url = https://download.nextcloud.com/server/releases/nextcloud-
16
.0.3.tar.bz2
url = https://download.nextcloud.com/server/releases/nextcloud-
23
.0.3.tar.bz2
md5sum =
d81902d2dec5d547779bec6336a438be
md5sum =
6aafeb80786928c5f4742356513eff53
[template-nextcloud-install.sh]
[template-nextcloud-install.sh]
<= nc-download
<= nc-download
[template-apache-httpd]
[template-apache-httpd]
...
@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/instance-nextcloud.cfg
output = ${buildout:directory}/instance-nextcloud.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
context =
context =
key gzip_location gzip:location
key gzip_location gzip:location
key python3_location python3:location
key python3_location python3:location
key news_updater_location news-updater:location
key news_updater_location news-updater:location
...
@@ -40,7 +40,7 @@ context =
...
@@ -40,7 +40,7 @@ context =
[custom-application-deployment]
[custom-application-deployment]
path = ${template-nextcloud-instance:output}
path = ${template-nextcloud-instance:output}
part-list = nextcloud-install
.sh
part-list = nextcloud-install
[nc-download-unpacked]
[nc-download-unpacked]
recipe = slapos.recipe.build:download-unpacked
recipe = slapos.recipe.build:download-unpacked
...
@@ -48,33 +48,33 @@ shared = true
...
@@ -48,33 +48,33 @@ shared = true
[news-updater]
[news-updater]
<= nc-download-unpacked
<= nc-download-unpacked
url = https://github.com/nextcloud/news-updater/archive/1
0.0.1
.tar.gz
url = https://github.com/nextcloud/news-updater/archive/1
1.0.0
.tar.gz
md5sum =
37387199c0482e08d01e9294cd95eaad
md5sum =
1e75222638cab49d3f66b7c76394f104
[nextcloud-app-spreed]
[nextcloud-app-spreed]
<= nc-download-unpacked
<= nc-download-unpacked
url = https://github.com/nextcloud
/spreed/releases/download/v6.0.5/spreed-6
.0.5.tar.gz
url = https://github.com/nextcloud
-releases/spreed/releases/download/v13.0.5/spreed-v13
.0.5.tar.gz
md5sum =
002c09e543edc141f6ca848782573376
md5sum =
53957da58e0585e02ad85aff2adee4a9
[nextcloud-app-richdocuments]
[nextcloud-app-richdocuments]
<= nc-download-unpacked
<= nc-download-unpacked
url = https://github.com/nextcloud
/richdocuments/releases/download/v3.7.17/richdocuments
.tar.gz
url = https://github.com/nextcloud
-releases/richdocuments/releases/download/v4.2.5/richdocuments-v4.2.5
.tar.gz
md5sum =
5559cd14a4a0a93d2a39b260538839f8
md5sum =
dbb3b516ddd9c77ab7c8be139f621ab5
[nextcloud-app-calendar]
[nextcloud-app-calendar]
<= nc-download-unpacked
<= nc-download-unpacked
url = https://github.com/nextcloud
/calendar/releases/download/v1.7.3/calendar
.tar.gz
url = https://github.com/nextcloud
-releases/calendar/releases/download/v3.2.2/calendar-v3.2.2
.tar.gz
md5sum = a
b398d943eb6939e3e71df5b1a1abf87
md5sum = a
8f19fa0dca70702bcde11eead67b095
[nextcloud-app-rainloop]
[nextcloud-app-rainloop]
<= nc-download-unpacked
<= nc-download-unpacked
url = https://github.com/pierre-alain-b/rainloop-nextcloud/releases/download/
6.1.4
/rainloop.tar.gz
url = https://github.com/pierre-alain-b/rainloop-nextcloud/releases/download/
7.2.5
/rainloop.tar.gz
md5sum =
7cefc3dd3bd52b42d381de7d7447691f
md5sum =
300866cbba170b2ad34db5d268107848
[nextcloud-app-news]
[nextcloud-app-news]
<= nc-download-unpacked
<= nc-download-unpacked
url = https://github.com/nextcloud/news/releases/download/1
4.2.2
/news.tar.gz
url = https://github.com/nextcloud/news/releases/download/1
8.0.1
/news.tar.gz
md5sum =
f48d4b5dcbc078131bb86a4ae619da99
md5sum =
6e41b6521195c75fa9170bb5a64d1562
[nextcloud-apps]
[nextcloud-apps]
spreed = ${nextcloud-app-spreed:location}
spreed = ${nextcloud-app-spreed:location}
...
...
stack/lamp/buildout.hash.cfg
View file @
36759a5d
...
@@ -30,4 +30,4 @@ md5sum = 04080510698732d84122b464fdb08c6a
...
@@ -30,4 +30,4 @@ md5sum = 04080510698732d84122b464fdb08c6a
[template-php.ini]
[template-php.ini]
filename = php.ini.in
filename = php.ini.in
md5sum =
599358f7df4c1e0de86270f5992ef90
4
md5sum =
203c40c3b35ffba1d562330b62f7a6f
4
stack/lamp/php.ini.in
View file @
36759a5d
...
@@ -43,7 +43,7 @@ apc.ttl=7200
...
@@ -43,7 +43,7 @@ apc.ttl=7200
apc.user_ttl=7200
apc.user_ttl=7200
apc.gc_ttl=3600
apc.gc_ttl=3600
apc.num_files_hint=1024
apc.num_files_hint=1024
apc.enable_cli=
0
apc.enable_cli=
{{ instance_dict.get('php.apc.enable_cli', 0) }}
apc.max_file_size=5M
apc.max_file_size=5M
apc.cache_by_default=1
apc.cache_by_default=1
apc.use_request_time=1
apc.use_request_time=1
...
...
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