Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Make Decidim SPOC-compatible, cont'd.

Browse Source
This commit is contained in:
Disassembler 2020-03-17 09:44:39 +01:00
parent f32b719630
commit be4042d7e4
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lxc-apps/decidim/app
View File

@ -1,5 +1,5 @@
{ {
"version": "0.20.0-191113", "version": "0.20.0-200313",
"meta": { "meta": {
"title": "Decidim", "title": "Decidim",
"desc-cs": "Platforma pro účast občanů", "desc-cs": "Platforma pro účast občanů",
@ -8,21 +8,21 @@
}, },
"containers": { "containers": {
"decidim": { "decidim": {
"image": "decidim_0.20.0-191113", "image": "decidim_0.20.0-200313",
"depends": [ "depends": [
"decidim-postgres" "decidim-postgres"
], ],
"mounts": [ "mounts": {
["DIR", "/srv/decidim/decidim_conf", "/srv/decidim-app/config"], "decidim/decidim_conf": "srv/decidim-app/config",
["DIR", "/srv/decidim/decidim_data/storage", "/srv/decidim-app/storage"], "decidim/decidim_data/storage": "srv/decidim-app/storage",
["DIR", "/srv/decidim/decidim_data/uploads", "/srv/decidim-app/public/uploads"] "decidim/decidim_data/uploads": "srv/decidim-app/public/uploads"
] }
}, },
"decidim-postgres": { "decidim-postgres": {
"image": "postgres_11.3.0-190620", "image": "postgres_12.2.0-200313",
"mounts": [ "mounts": {
["DIR", "/srv/decidim/postgres_data", "/var/lib/postgresql"] "decidim/postgres_data": "var/lib/postgresql"
] }
} }
} }
} }

6
lxc-apps/decidim/install.sh
View File

@ -23,8 +23,8 @@ envsubst <createdb.sql | spoc-container exec decidim-postgres -- psql
cp -rp ${LAYERS_DIR}/decidim_0.20.0-200313/srv/decidim-app/config ${DECIDIM_CONF} cp -rp ${LAYERS_DIR}/decidim_0.20.0-200313/srv/decidim-app/config ${DECIDIM_CONF}
# Configure Decidim # Configure Decidim
install -o 108080 -g 108080 -m 700 ${DECIDIM_DATA}/storage install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/storage
install -o 108080 -g 108080 -m 700 ${DECIDIM_DATA}/uploads install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/uploads
export DECIDIM_SECRET=$(spoc-container exec -u 8080 -g 8080 decidim -- sh -c 'cd /srv/decidim-app; rake secret') export DECIDIM_SECRET=$(spoc-container exec -u 8080 -g 8080 decidim -- sh -c 'cd /srv/decidim-app; rake secret')
install -o 108080 -g 108080 -m 640 decidim_conf/environments/production.rb ${DECIDIM_CONF}/environments/production.rb install -o 108080 -g 108080 -m 640 decidim_conf/environments/production.rb ${DECIDIM_CONF}/environments/production.rb
install -o 108080 -g 108080 -m 640 decidim_conf/initializers/decidim.rb ${DECIDIM_CONF}/initializers/decidim.rb install -o 108080 -g 108080 -m 640 decidim_conf/initializers/decidim.rb ${DECIDIM_CONF}/initializers/decidim.rb
@ -39,7 +39,7 @@ export DECIDIM_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=')
envsubst <adminpwd.rb | spoc-container exec -u 8080 -g 8080 decidim -- sh -c 'cd /srv/decidim-app; bin/rails console -e production' envsubst <adminpwd.rb | spoc-container exec -u 8080 -g 8080 decidim -- sh -c 'cd /srv/decidim-app; bin/rails console -e production'
# Stop services required for setup # Stop services required for setup
spoc-constainer stop decidim-postgres spoc-container stop decidim-postgres
# Register application # Register application
vmmgr register-app decidim decidim "${DECIDIM_ADMIN_EMAIL}" "${DECIDIM_ADMIN_PWD}" vmmgr register-app decidim decidim "${DECIDIM_ADMIN_EMAIL}" "${DECIDIM_ADMIN_PWD}"