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

Bump Ruby to 2.6.6 and Decidim to 0.22.0

Browse Source
This commit is contained in:
Disassembler 2020-10-04 23:15:31 +02:00
parent c3d5542bee
commit f79cddbf44
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
7 changed files with 98 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apk/vmmgr

@ -1 +1 @@
Subproject commit ccec8faff6e74e27aa21d53f39cf6bc916780b13
Subproject commit 9d18f665c54f750528f0ad2f07fd0812ef70f135

4
lxc-apps/decidim/app
View File

@ -1,5 +1,5 @@
{
"version": "0.21.0-200621",
"version": "0.22.0-201004",
"meta": {
"title": "Decidim",
"desc-cs": "Platforma pro účast občanů",
@ -8,7 +8,7 @@
},
"containers": {
"decidim": {
"image": "decidim_0.21.0-200621",
"image": "decidim_0.22.0-201004",
"depends": [
"decidim-postgres"
],

4
lxc-apps/decidim/image
View File

@ -1,5 +1,5 @@
IMAGE decidim_0.21.0-200621
FROM alpine3.11-ruby2.6_2.6.5-200621
IMAGE decidim_0.22.0-201004
FROM alpine3.11-ruby2.6_2.6.6-201004
# https://github.com/Platoniq/decidim-install/blob/master/decidim-bionic.md
# https://github.com/Platoniq/decidim-install/blob/master/basic-config.md

10
lxc-apps/decidim/image.d/srv/decidim-app/Gemfile
View File

@ -4,13 +4,13 @@ source "https://rubygems.org"
ruby RUBY_VERSION
gem "decidim", "0.21.0"
# gem "decidim-consultations", "0.21.0"
# gem "decidim-initiatives", "0.21.0"
gem "decidim", "0.22.0"
# gem "decidim-consultations", "0.22.0"
# gem "decidim-initiatives", "0.22.0"
gem "bootsnap", "~> 1.3"
gem "puma", "~> 4.3.3"
gem "puma", ">= 4.3.5"
gem "uglifier", "~> 4.1"
gem "faker", "~> 1.9"
@ -18,7 +18,7 @@ gem "faker", "~> 1.9"
group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
gem "decidim-dev", "0.21.0"
gem "decidim-dev", "0.22.0"
end
group :development do

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

@ -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.21.0-200621"
DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.22.0-201004"
# Create Postgres instance
install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}

92
lxc-apps/decidim/install/decidim_conf/initializers/decidim.rb
View File

@ -1,21 +1,44 @@
# frozen_string_literal: true
Decidim.configure do |config|
# The name of the application
config.application_name = "Decidim"
# The email that will be used as sender in all emails from Decidim
config.mailer_sender = "admin@example.com"
# Change these lines to set your preferred locales
config.default_locale = :cs
# Sets the list of available locales for the whole application.
#
# When an organization is created through the System area, system admins will
# be able to choose the available languages for that organization. That list
# of languages will be equal or a subset of the list in this file.
config.available_locales = [:cs, :sk, :en, :de, :fr, :es]
# Restrict access to the system part with an authorized ip list.
# You can use a single ip like ("1.2.3.4"), or an ip subnet like ("1.2.3.4/24")
# You may specify multiple ip in an array ["1.2.3.4", "1.2.3.4/24"]
# config.system_accesslist_ips = ["127.0.0.1"]
# Sets the default locale for new organizations. When creating a new
# organization from the System area, system admins will be able to overwrite
# this value for that specific organization.
config.default_locale = :cs
# Defines a list of custom content processors. They are used to parse and
# render specific tags inside some user-provided content. Check the docs for
# more info.
# config.content_processors = []
# Whether SSL should be enabled or not.
# config.force_ssl = true
# Geocoder configuration
# config.geocoder = {
# static_map_url: "https://image.maps.cit.api.here.com/mia/1.6/mapview",
# here_app_id: Rails.application.secrets.geocoder[:here_app_id],
# here_app_code: Rails.application.secrets.geocoder[:here_app_code]
# static_map_url: "https://image.maps.ls.hereapi.com/mia/1.6/mapview",
# here_api_key: Rails.application.secrets.geocoder[:here_api_key]
# }
# Custom resource reference generator method
# Custom resource reference generator method. Check the docs for more info.
# config.reference_generator = lambda do |resource, component|
# # Implement your custom method to generate resources references
# "1234-#{resource.id}"
@ -24,7 +47,17 @@ Decidim.configure do |config|
# Currency unit
# config.currency_unit = "€"
# The number of reports which an object can receive before hiding it
# Defines the quality of image uploads after processing. Image uploads are
# processed by Decidim, this value helps reduce the size of the files.
# config.image_uploader_quality = 80
# The maximum file size of an attachment
# config.maximum_attachment_size = 10.megabytes
# The maximum file size for a user avatar
# config.maximum_avatar_size = 10.megabytes
# The number of reports which a resource can receive before hiding it
# config.max_reports_before_hiding = 3
# Custom HTML Header snippets
@ -42,6 +75,36 @@ Decidim.configure do |config|
#
config.enable_html_header_snippets = false
# Allow organizations admins to track newsletter links.
# config.track_newsletter_links = true
# Amount of time that the data portability files will be available in the server.
# config.data_portability_expiry_time = 7.days
# Max requests in a time period to prevent DoS attacks. Only applied on production.
# config.throttling_max_requests = 100
# Time window in which the throttling is applied.
# config.throttling_period = 1.minute
# Time window were users can access the website even if their email is not confirmed.
# config.unconfirmed_access_for = 2.days
# Etherpad configuration. Check the docs for more info.
# config.etherpad = {
# server: <your url>,
# api_key: <your key>,
# api_version: <your version>
# }
# A base path for the uploads. If set, make sure it ends in a slash.
# Uploads will be set to `<base_path>/uploads/`. This can be useful if you
# want to use the same uploads place for both staging and production
# environments, but in different folders.
#
# If not set, it will be ignored.
# config.base_uploads_path = nil
# SMS gateway configuration
#
# If you want to verify your users by sending a verification code via
@ -122,6 +185,21 @@ Decidim.configure do |config|
# api_key: Rails.application.secrets.etherpad[:api_key],
# api_version: Rails.application.secrets.etherpad[:api_version]
# }
# Sets Decidim::Exporters::CSV's default column separator
# config.default_csv_col_sep = ";"
# The list of roles a user can have, not considering the space-specific roles.
# config.user_roles = %w(admin user_manager)
# The list of visibility options for amendments. An Array of Strings that
# serve both as locale keys and values to construct the input collection in
# Decidim::Amendment::VisibilityStepSetting::options.
#
# This collection is used in Decidim::Admin::SettingsHelper to generate a
# radio buttons collection input field form for a Decidim::Component
# step setting :amendments_visibility.
# config.amendments_visibility_options = %w(all participants)
end
Rails.application.config.i18n.available_locales = Decidim.available_locales

4
lxc-shared/alpine3.11-ruby2.6/image
View File

@ -1,4 +1,4 @@
IMAGE alpine3.11-ruby2.6_2.6.5-200621
IMAGE alpine3.11-ruby2.6_2.6.6-201004
FROM alpine3.11_3.11.6-200621
RUN EOF
@ -10,7 +10,7 @@ RUN EOF
# Download and unpack Ruby
mkdir -p /usr/src/ruby
wget http://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.tar.xz -O - | tar xJf - -C /usr/src/ruby --strip-components=1
wget http://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.6.tar.xz -O - | tar xJf - -C /usr/src/ruby --strip-components=1
# Compile and install Ruby
cd /usr/src/ruby