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
Xavier Thompson
slapos
Commits
b336f593
Commit
b336f593
authored
2 years ago
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Update LAMP stack (and nextcloud) to use python3
See merge request
nexedi/slapos!1163
parents
19498bbe
121225af
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
36 additions
and
32 deletions
+36
-32
software/gitlab/buildout.hash.cfg
software/gitlab/buildout.hash.cfg
+2
-2
software/gitlab/instance-gitlab-export.cfg.in
software/gitlab/instance-gitlab-export.cfg.in
+1
-1
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+11
-12
software/matomo/software.cfg
software/matomo/software.cfg
+0
-4
software/nextcloud/buildout.hash.cfg
software/nextcloud/buildout.hash.cfg
+1
-1
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
+10
-9
software/nextcloud/test/test.py
software/nextcloud/test/test.py
+1
-1
software/slapos-sr-testing/software-py3.cfg
software/slapos-sr-testing/software-py3.cfg
+1
-0
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+0
-1
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-0
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
software/gitlab/buildout.hash.cfg
View file @
b336f593
...
...
@@ -54,11 +54,11 @@ md5sum = 0f1ec4077dab586cc003ae13f689eda2
[instance-gitlab.cfg.in]
_update_hash_filename_ = instance-gitlab.cfg.in
md5sum =
c115c88d5798dcb5e16b9d50432f2551
md5sum =
0b023c7efd027f65b14e752484be2ec7
[instance-gitlab-export.cfg.in]
_update_hash_filename_ = instance-gitlab-export.cfg.in
md5sum =
da2e3d6f67c92233d370dae55fb3b35f
md5sum =
9ed8220bb3ad71ff7e8638354127412c
[instance-gitlab-test.cfg.in]
_update_hash_filename_ = instance-gitlab-test.cfg.in
...
...
This diff is collapsed.
Click to expand it.
software/gitlab/instance-gitlab-export.cfg.in
View file @
b336f593
...
...
@@ -74,7 +74,7 @@ context =
raw unicorn_script ${service-unicorn:wrapper-path}
raw sidekiq_script ${service-sidekiq:wrapper-path}
raw gitlab_backup_dir ${gitlab-backup-directory:backup-gitlab.git}
raw redis_pid_file ${service-redis:pid
_
file}
raw redis_pid_file ${service-redis:pid
-
file}
raw postgres_pid_file ${service-postgresql:pgdata-directory}/postmaster.pid
raw gitlab_work_location ${gitlab-work:location}
raw promise_lab_location ${directory:promise.slow}
This diff is collapsed.
Click to expand it.
software/gitlab/instance-gitlab.cfg.in
View file @
b336f593
...
...
@@ -497,19 +497,20 @@ log = ${directory:log}/redis
[service-redis]
recipe = slapos.cookbook:redis.server
wrapper = ${directory:service}/redis
promise
_
wrapper = ${directory:bin}/redis-promise
server
_
dir = ${redis:srv}
config
_
file = ${directory:etc}/redis.conf
log
_
file = ${redis:log}/redis.log
pid
_
file = ${directory:run}/redis.pid
use
_
passwd = false
unixsocket = ${:server
_
dir}/redis.socket
promise
-
wrapper = ${directory:bin}/redis-promise
server
-
dir = ${redis:srv}
config
-
file = ${directory:etc}/redis.conf
log
-
file = ${redis:log}/redis.log
pid
-
file = ${directory:run}/redis.pid
use
-
passwd = false
unixsocket = ${:server
-
dir}/redis.socket
# port = 0 means "don't listen on TCP at all" - listen only on unix socket
ipv6 = ::1
port = 0
server_bin = {{ redis_binprefix }}/redis-server
server-bin = {{ redis_binprefix }}/redis-server
cli-bin = {{ redis_binprefix }}/redis-cli
depend =
${logrotate-entry-redis:recipe}
...
...
@@ -517,9 +518,7 @@ depend =
<= monitor-promise-base
promise = check_command_execute
name = promise-redis.py
config-command = ${service-redis:promise_wrapper}
# NOTE slapos.cookbook:redis.server setups promise automatically
config-command = ${service-redis:promise-wrapper}
[logrotate-entry-redis]
<= logrotate-entry-base
...
...
This diff is collapsed.
Click to expand it.
software/matomo/software.cfg
View file @
b336f593
...
...
@@ -17,10 +17,6 @@ parts =
# to create file instance.cfg of all instances
instance
#to make sure we use python3
[python]
part = python3
# download bas
# inherited by modules that need to download files
[matomo-download]
...
...
This diff is collapsed.
Click to expand it.
software/nextcloud/buildout.hash.cfg
View file @
b336f593
...
...
@@ -26,4 +26,4 @@ md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
[template-nextcloud-instance]
filename = nextcloud-instance.cfg.in
md5sum = 4
95b1693e451f6c5044c67ce5f1194fe
md5sum = 4
426b5e62c61efec2e68e7f548bc6463
This diff is collapsed.
Click to expand it.
software/nextcloud/nextcloud-input-schema.json
View file @
b336f593
...
...
@@ -129,6 +129,11 @@
"title"
:
"Third authorized domain on nextcloud"
,
"description"
:
"Trusted domain used to connect to Nextcloud instance."
,
"type"
:
"string"
},
"instance.trusted-proxy-list"
:
{
"title"
:
"Trusted proxies"
,
"description"
:
"IP adresses of trusted proxies, space separated."
,
"type"
:
"string"
}
}
}
This diff is collapsed.
Click to expand it.
software/nextcloud/nextcloud-instance.cfg.in
View file @
b336f593
...
...
@@ -12,17 +12,18 @@ backup = ${directory:backup}/nextcloud
[service-redis]
recipe = slapos.cookbook:redis.server
wrapper = ${directory:services}/redis
promise
_
wrapper = ${directory:bin}/redis-promise
server
_
dir = ${nc-directory:redis}
config
_
file = ${directory:etc}/redis.conf
log
_
file = ${nc-directory:redis-log}/redis.log
pid
_
file = ${directory:run}/redis.pid
use
_
passwd = false
unixsocket = ${:server
_
dir}/redis.socket
promise
-
wrapper = ${directory:bin}/redis-promise
server
-
dir = ${nc-directory:redis}
config
-
file = ${directory:etc}/redis.conf
log
-
file = ${nc-directory:redis-log}/redis.log
pid
-
file = ${directory:run}/redis.pid
use
-
passwd = false
unixsocket = ${:server
-
dir}/redis.socket
# port = 0 means "don't listen on TCP at all" - listen only on unix socket
ipv6 = ::1
port = 0
server_bin = {{ redis_bin }}
server-bin = {{ redis_bin }}
cli-bin = {{ redis_cli }}
depend =
${logrotate-entry-redis:recipe}
...
...
@@ -30,7 +31,7 @@ depend =
<= monitor-promise-base
promise = check_command_execute
name = redis.py
config-command = ${service-redis:promise
_
wrapper}
config-command = ${service-redis:promise
-
wrapper}
[logrotate-entry-redis]
<= logrotate-entry-base
...
...
This diff is collapsed.
Click to expand it.
software/nextcloud/test/test.py
View file @
b336f593
...
...
@@ -272,7 +272,7 @@ class TestServices(NextCloudTestCase):
news_config_file
=
os
.
path
.
join
(
self
.
partition_dir
,
'srv/data/news/config/config.ini'
)
with
open
(
news_config_file
)
as
f
:
config
=
f
.
read
()
self
.
assertRegex
pMatches
(
config
,
r"(useCronUpdates\
s+=
\s+false)"
)
self
.
assertRegex
(
config
,
r"(useCronUpdates\
s+=
\s+false)"
)
class
TestNextCloudParameters
(
NextCloudTestCase
):
...
...
This diff is collapsed.
Click to expand it.
software/slapos-sr-testing/software-py3.cfg
View file @
b336f593
...
...
@@ -21,6 +21,7 @@ extra =
jupyter ${slapos.test.jupyter-setup:setup}
matomo ${slapos.test.matomo-setup:setup}
monitor ${slapos.test.monitor-setup:setup}
nextcloud ${slapos.test.nextcloud-setup:setup}
nginx-push-stream ${slapos.test.nginx-push-stream-setup:setup}
plantuml ${slapos.test.plantuml-setup:setup}
powerdns ${slapos.test.powerdns-setup:setup}
...
...
This diff is collapsed.
Click to expand it.
software/slapos-sr-testing/software.cfg
View file @
b336f593
...
...
@@ -371,7 +371,6 @@ extra =
htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
jscrawler ${slapos.test.jscrawler-setup:setup}
jstestnode ${slapos.test.jstestnode-setup:setup}
nextcloud ${slapos.test.nextcloud-setup:setup}
re6stnet ${slapos.test.re6stnet-setup:setup}
seleniumserver ${slapos.test.seleniumserver-setup:setup}
slapos-master ${slapos.test.slapos-master-setup:setup}
...
...
This diff is collapsed.
Click to expand it.
stack/lamp/buildout.cfg
View file @
b336f593
...
...
@@ -38,6 +38,9 @@ url = ${:_profile_base_location_}/${:filename}
[application]
recipe = slapos.recipe.build:download-unpacked
[python]
part = python3
#----------------
#--
#-- Optional part allowing applications using this stack to run a custom
...
...
This diff is collapsed.
Click to expand it.
stack/slapos.cfg
View file @
b336f593
...
...
@@ -189,7 +189,7 @@ setproctitle = 1.1.10
setuptools-dso = 1.7
rubygemsrecipe = 0.4.3
six = 1.12.0
slapos.cookbook = 1.0.2
37
slapos.cookbook = 1.0.2
44
slapos.core = 1.7.6
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0
...
...
This diff is collapsed.
Click to expand it.
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