From 88893abc5059b59d9ecfa502dab155f87bc58ca5 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Mon, 11 Jan 2021 12:37:44 +0100 Subject: [PATCH] Install and configure Decidim plugins, related to #490 --- lxc-apps/decidim/app | 4 ++-- lxc-apps/decidim/decidim.image | 2 +- .../decidim.image.d/srv/decidim-app/Gemfile | 22 +++++++++++++++++++ .../config}/environments/production.rb | 0 lxc-apps/decidim/install.sh | 12 ++++++++-- lxc-apps/decidim/update.sh | 8 +++++++ 6 files changed, 43 insertions(+), 5 deletions(-) rename lxc-apps/decidim/{install/decidim_conf => decidim.image.d/srv/decidim-app/config}/environments/production.rb (100%) diff --git a/lxc-apps/decidim/app b/lxc-apps/decidim/app index 6f1f03e..2c3287c 100644 --- a/lxc-apps/decidim/app +++ b/lxc-apps/decidim/app @@ -1,5 +1,5 @@ { - "version": "0.23.1-210106", + "version": "0.23.1-210110", "meta": { "title": "Decidim", "desc-cs": "Platforma pro účast občanů", @@ -8,7 +8,7 @@ }, "containers": { "decidim": { - "image": "decidim_0.23.1-210106", + "image": "decidim_0.23.1-210110", "depends": [ "decidim-postgres" ], diff --git a/lxc-apps/decidim/decidim.image b/lxc-apps/decidim/decidim.image index 6b791ed..bd0c0a8 100644 --- a/lxc-apps/decidim/decidim.image +++ b/lxc-apps/decidim/decidim.image @@ -1,4 +1,4 @@ -IMAGE decidim_0.23.1-210106 +IMAGE decidim_0.23.1-210110 FROM decidim-nginx_1.18.0-210106 # https://github.com/Platoniq/decidim-install/blob/master/decidim-bionic.md diff --git a/lxc-apps/decidim/decidim.image.d/srv/decidim-app/Gemfile b/lxc-apps/decidim/decidim.image.d/srv/decidim-app/Gemfile index 99ffaec..3b80d58 100644 --- a/lxc-apps/decidim/decidim.image.d/srv/decidim-app/Gemfile +++ b/lxc-apps/decidim/decidim.image.d/srv/decidim-app/Gemfile @@ -38,3 +38,25 @@ group :production do gem "delayed_job_active_record" gem "daemons" end + +# Modules +# gem "decidim-access_requests", git: "https://github.com/mainio/decidim-module-access_requests" # Supported until 0.22.0 +# gem "decidim-action_delegator", git: "https://github.com/coopdevs/decidim-module-action_delegator" # Supported until 0.22.0, not indended for production use +# gem "decidim-antivirus", git: "https://github.com/mainio/decidim-module-antivirus" # Supported until 0.22.0 +# gem "decidim-budgets_enhanced", git: "https://github.com/OpenSourcePolitics/decidim-module-budgets_enhanced", branch: "0.22-dev" # Supported until 0.19.0, development branch exists up to 0.22.0 +gem "decidim-calendar", git: "https://github.com/alabs/decidim-module-calendar" +# gem "decidim-comparative_stats", git: "https://github.com/Platoniq/decidim-module-comparative_stats" # Supported until 0.21.0, installable but fail assets:precompile +# gem "decidim-cookies", git: "https://github.com/OpenSourcePolitics/decidim-module_cookies" # Supported until 0.21.0 +gem "decidim-decidim_awesome", git: "https://github.com/Platoniq/decidim-module-decidim_awesome" +# gem "decidim-department_admin", git: "https://github.com/gencat/decidim-department-admin" # Supported until 0.16.0 +gem "decidim-direct_verifications", git: "https://github.com/Platoniq/decidim-verifications-direct_verifications" +# gem "decidim-favorites", git: "https://github.com/mainio/decidim-module-favorites" # Required by plans +gem "decidim-ldap", git: "https://github.com/diputacioBCN/decidim-diba", glob: "decidim-ldap/decidim-ldap.gemspec" +gem "decidim-navbar_links", git: "https://github.com/OpenSourcePolitics/decidim-module-navbar_links", branch: "0.23-stable" +gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps" +# gem "decidim-plans", git: "https://github.com/mainio/decidim-module-plans" # Supported until 0.22.0 +# gem "decidim-process_groups_content_block", git: "https://github.com/mainio/decidim-module-process_groups_content_block" # Supported until 0.22.0 +# gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer" # Supported until 0.22.0 +gem "decidim-time_tracker", git: "https://github.com/Platoniq/decidim-module-time_tracker", branch: "main" +# gem "decidim-unique_identity", git: "https://github.com/OpenSourcePolitics/decidim-module-unique-identity" # Supported until 0.18.0 +gem "decidim-url_aliases", git: "https://github.com/OpenSourcePolitics/decidim-urlaliases" diff --git a/lxc-apps/decidim/install/decidim_conf/environments/production.rb b/lxc-apps/decidim/decidim.image.d/srv/decidim-app/config/environments/production.rb similarity index 100% rename from lxc-apps/decidim/install/decidim_conf/environments/production.rb rename to lxc-apps/decidim/decidim.image.d/srv/decidim-app/config/environments/production.rb diff --git a/lxc-apps/decidim/install.sh b/lxc-apps/decidim/install.sh index 42935a9..4d2716b 100755 --- a/lxc-apps/decidim/install.sh +++ b/lxc-apps/decidim/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/decidim/postgres_data" DECIDIM_CONF="${VOLUMES_DIR}/decidim/decidim_conf" DECIDIM_DATA="${VOLUMES_DIR}/decidim/decidim_data" -DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.23.1-210106" +DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.23.1-210110" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} @@ -28,14 +28,22 @@ install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/migrate install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/storage 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; bin/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/initializers/decidim.rb ${DECIDIM_CONF}/initializers/decidim.rb envsubst