diff --git a/README.md b/README.md index eca20e5..932d16e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ MobiliZon aims to solve existing platform's problems to organize events in a dec Mobilizon is a tool designed to create platforms for managing communities and events. Its purpose is to help as many people as possible to free themselves from Facebook groups and events, from Meetup, etc. -**Shipped version:** 0.1.0-2019-10-04 +**Shipped version:** 0.1.0-2019-10-09 ## Important points to read before installing diff --git a/conf/.env b/conf/.env index 9a30482..592e830 100644 --- a/conf/.env +++ b/conf/.env @@ -19,4 +19,4 @@ MOBILIZON_DATABASE_USERNAME="__DB_USER__" MOBILIZON_DATABASE_PASSWORD="__DB_PWD__" MOBILIZON_DATABASE_DBNAME="__DB_NAME__" MOBILIZON_DATABASE_HOST="localhost" -MOBILIZON_DATABASE_PORT="5432" +MOBILIZON_DATABASE_PORT=5432 diff --git a/conf/app.src b/conf/app.src index 567f0da..42cc2dd 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/e34f304b76e2dd1a4456d00d4e445605722eb34a/mobilizon-e34f304b76e2dd1a4456d00d4e445605722eb34a.tar.gz -SOURCE_SUM=7305cef7c6d1e203ba11eb5cce00ad1491e62e4fdc55f1c824d06b25dd1022bd +SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/e0c6e599570688b9eee43d0d89d1403ab84edc60/mobilizon-e0c6e599570688b9eee43d0d89d1403ab84edc60.tar.gz +SOURCE_SUM=84b186b8db03c58d9526654e5df35fde2f7ff577aeef2e3532fc966477355bdc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/prod.exs b/conf/prod.exs index 15e7e9f..59a2308 100644 --- a/conf/prod.exs +++ b/conf/prod.exs @@ -1,24 +1,11 @@ -use Mix.Config +import Config -# For production, we often load configuration from external -# sources, such as your system environment. For this reason, -# you won't find the :http configuration below, but set inside -# MobilizonWeb.Endpoint.init/2 when load_from_system_env is -# true. Any dynamic configuration should be done there. -# -# Don't forget to configure the url host to something meaningful, -# Phoenix uses this information when generating URLs. -# -# Finally, we also include the path to a cache manifest -# containing the digested version of static files. This -# manifest is generated by the mix phx.digest task -# which you typically run after static files are built. config :mobilizon, MobilizonWeb.Endpoint, load_from_system_env: true, url: [ host: "__DOMAIN__", - scheme: "https", - port: 443 + port: 443, + scheme: "https" ], http: [ ip: {127, 0, 0, 1}, @@ -26,11 +13,11 @@ config :mobilizon, MobilizonWeb.Endpoint, ], secret_key_base: "__SECRET__", - cache_static_manifest: "priv/static/js/manifest.json" + cache_static_manifest: "priv/static/manifest.json" # Configure your database -config :mobilizon, Mobilizon.Repo, - types: Mobilizon.PostgresTypes, +config :mobilizon, Mobilizon.Storage.Repo, + types: Mobilizon.Storage.PostgresTypes, username: "__DB_USER__", password: "__DB_PWD__", database: "__DB_NAME__", @@ -38,7 +25,7 @@ config :mobilizon, Mobilizon.Repo, port: "5432", pool_size: 15 -config :mobilizon, Mobilizon.Mailer, +config :mobilizon, MobilizonWeb.Email.Mailer, adapter: Bamboo.SMTPAdapter, server: "localhost", hostname: "localhost", diff --git a/manifest.json b/manifest.json index 6217d5f..864a22b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Your federated organization and mobilization platform.", "fr": "Votre plateforme fédérée d'organisation et de mobilisation." }, - "version": "0.1.0-2019-10-04~ynh1", + "version": "0.1.0-2019-10-09~ynh1", "url": "https://joinmobilizon.org/", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 32bc8a4..bdaa61a 100644 --- a/scripts/install +++ b/scripts/install @@ -107,6 +107,7 @@ ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS postgis;" --database=$db_name ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS unaccent;" --database=$db_name +ynh_psql_execute_as_root --sql="ALTER USER $db_user PASSWORD '$db_pwd';" --database=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE diff --git a/scripts/upgrade b/scripts/upgrade index 64dc9d8..14e2222 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,6 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while) # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - read -p "key" # restore it if the upgrade fails ynh_restore_upgradebackup ynh_clean_check_starting