From 6f6155f7438bf314d963ddc042bddfae68952e86 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Wed, 30 Jun 2021 11:08:23 +0200 Subject: [PATCH] before upgrade to 1.2.0 --- config/config.exs | 18 ++++----- config/runtime.exs | 35 ------------------ .../icons/android-chrome-192x192 (copie).png | Bin .../img/icons/android-chrome-192x192.png | Bin .../img/icons/android-chrome-512x512.png | Bin .../icons/android-chrome-maskable-512x512.png | Bin .../img/icons/apple-touch-icon-120x120.png | Bin .../img/icons/apple-touch-icon-152x152.png | Bin .../img/icons/apple-touch-icon-180x180.png | Bin .../img/icons/apple-touch-icon-60x60.png | Bin .../img/icons/apple-touch-icon-76x76.png | Bin js/public/img/icons/apple-touch-icon.png | Bin js/public/img/icons/favicon-16x16.png | Bin js/public/img/icons/favicon-32x32.png | Bin js/public/img/icons/icon-128x128.png | Bin js/public/img/icons/icon-384x384.png | Bin js/public/img/icons/icon-512x512.png | Bin js/public/img/icons/icon-96x96.png | Bin .../img/icons/msapplication-icon-144x144.png | Bin js/public/img/icons/mstile-150x150.png | Bin js/public/img/icons/safari-pinned-tab.svg | 0 js/public/img/koena-a11y.svg | 0 js/public/img/mobilizon_default_card.png | Bin js/public/img/mobilizon_logo.png | Bin .../Heidelberg_Altstadt_Schloss_Luftbild.jpg | Bin js/public/img/pics/Mairie_Montrouge.jpeg | Bin js/public/img/pics/SOTM_2019_Group_Photo.jpg | Bin .../cartoparty_versailles_accessibility.jpeg | Bin js/public/img/pics/error.jpg | Bin js/public/img/pics/event_creation.jpg | Bin js/public/img/pics/footer_1.jpg | Bin js/public/img/pics/footer_2.jpg | Bin js/public/img/pics/footer_3.jpg | Bin js/public/img/pics/footer_4.jpg | Bin js/public/img/pics/footer_5.jpg | Bin js/public/img/pics/group.jpg | Bin js/public/img/pics/homepage.jpg | Bin js/public/img/pics/homepage_background.png | Bin js/public/img/pics/lyon.jpeg | Bin js/public/img/pics/lyon_photo.jpeg | Bin js/public/img/pics/realisation.jpg | Bin js/public/img/pics/rose.jpg | Bin 42 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 config/runtime.exs mode change 100644 => 100755 js/public/img/icons/android-chrome-192x192 (copie).png mode change 100644 => 100755 js/public/img/icons/android-chrome-192x192.png mode change 100644 => 100755 js/public/img/icons/android-chrome-512x512.png mode change 100644 => 100755 js/public/img/icons/android-chrome-maskable-512x512.png mode change 100644 => 100755 js/public/img/icons/apple-touch-icon-120x120.png mode change 100644 => 100755 js/public/img/icons/apple-touch-icon-152x152.png mode change 100644 => 100755 js/public/img/icons/apple-touch-icon-180x180.png mode change 100644 => 100755 js/public/img/icons/apple-touch-icon-60x60.png mode change 100644 => 100755 js/public/img/icons/apple-touch-icon-76x76.png mode change 100644 => 100755 js/public/img/icons/apple-touch-icon.png mode change 100644 => 100755 js/public/img/icons/favicon-16x16.png mode change 100644 => 100755 js/public/img/icons/favicon-32x32.png mode change 100644 => 100755 js/public/img/icons/icon-128x128.png mode change 100644 => 100755 js/public/img/icons/icon-384x384.png mode change 100644 => 100755 js/public/img/icons/icon-512x512.png mode change 100644 => 100755 js/public/img/icons/icon-96x96.png mode change 100644 => 100755 js/public/img/icons/msapplication-icon-144x144.png mode change 100644 => 100755 js/public/img/icons/mstile-150x150.png mode change 100644 => 100755 js/public/img/icons/safari-pinned-tab.svg mode change 100644 => 100755 js/public/img/koena-a11y.svg mode change 100644 => 100755 js/public/img/mobilizon_default_card.png mode change 100644 => 100755 js/public/img/mobilizon_logo.png mode change 100644 => 100755 js/public/img/pics/Heidelberg_Altstadt_Schloss_Luftbild.jpg mode change 100644 => 100755 js/public/img/pics/Mairie_Montrouge.jpeg mode change 100644 => 100755 js/public/img/pics/SOTM_2019_Group_Photo.jpg mode change 100644 => 100755 js/public/img/pics/cartoparty_versailles_accessibility.jpeg mode change 100644 => 100755 js/public/img/pics/error.jpg mode change 100644 => 100755 js/public/img/pics/event_creation.jpg mode change 100644 => 100755 js/public/img/pics/footer_1.jpg mode change 100644 => 100755 js/public/img/pics/footer_2.jpg mode change 100644 => 100755 js/public/img/pics/footer_3.jpg mode change 100644 => 100755 js/public/img/pics/footer_4.jpg mode change 100644 => 100755 js/public/img/pics/footer_5.jpg mode change 100644 => 100755 js/public/img/pics/group.jpg mode change 100644 => 100755 js/public/img/pics/homepage.jpg mode change 100644 => 100755 js/public/img/pics/homepage_background.png mode change 100644 => 100755 js/public/img/pics/lyon.jpeg mode change 100644 => 100755 js/public/img/pics/lyon_photo.jpeg mode change 100644 => 100755 js/public/img/pics/realisation.jpg mode change 100644 => 100755 js/public/img/pics/rose.jpg diff --git a/config/config.exs b/config/config.exs index 40685256f..94485ff8c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -35,8 +35,8 @@ config :mobilizon, :instance, activity_expire_days: 365, activity_keep_number: 100, enable_instance_feeds: false, - email_from: "noreply@localhost", - email_reply_to: "noreply@localhost" + email_from: "noreply-mobilizon@openstreetmap.fr", + email_reply_to: "noreply-mobilizon@openstreetmap.fr" config :mobilizon, :groups, enabled: true @@ -83,7 +83,7 @@ config :mobilizon, Mobilizon.Web.Upload, ] ] -config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "/var/lib/mobilizon/uploads" +config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "/data/work/mobilizon/live/uploads" config :mobilizon, :media_proxy, enabled: true, @@ -100,12 +100,12 @@ config :mobilizon, :media_proxy, config :mobilizon, Mobilizon.Web.Email.Mailer, adapter: Bamboo.SMTPAdapter, - server: "localhost", - hostname: "localhost", + server: "mail.openstreetmap.fr", + hostname: "openstreetmap.fr", # usually 25, 465 or 587 - port: 25, - username: nil, - password: nil, + port: 587, + username: "noreply-mobilizon@openstreetmap.fr", + password: "rpEKYzsgNrM9ChP", # can be `:always` or `:never` tls: :if_available, allowed_tls_versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"], @@ -189,7 +189,7 @@ config :mobilizon, :activitypub, actor_key_rotation_delay: 3_600 * 48, sign_object_fetches: true -config :mobilizon, Mobilizon.Service.Geospatial, service: Mobilizon.Service.Geospatial.Nominatim +config :mobilizon, Mobilizon.Service.Geospatial, service: Mobilizon.Service.Geospatial.Addok config :mobilizon, Mobilizon.Service.Geospatial.Nominatim, endpoint: "https://nominatim.openstreetmap.org", diff --git a/config/runtime.exs b/config/runtime.exs deleted file mode 100644 index 1dd2a4d4b..000000000 --- a/config/runtime.exs +++ /dev/null @@ -1,35 +0,0 @@ -# Mobilizon instance configuration - -import Config - -config :mobilizon, Mobilizon.Web.Endpoint, - server: true, - url: [host: "mob.lan"], - http: [ - ip: {0, 0, 0, 0, 0, 0, 0, 1}, - port: 4000 - ], - secret_key_base: "TXEO1btWtIkar6DYi8fAeIj0Rw6VXPzEFgwugvyA0qD+45qTLt8o088BBDakcf59" - -config :mobilizon, Mobilizon.Web.Auth.Guardian, - secret_key: "FSiVN0xM6m194UMfW9lsj/o5vXYTkJjaFGLGKcbDfjSz5r7UE6e+tYAjhly70ZxG" - -config :mobilizon, :instance, - name: "moblan", - description: "Change this to a proper description of your instance", - hostname: "mob.lan", - registrations_open: false, - demo: false, - allow_relay: true, - federating: true, - email_from: "noreply@mob.lan", - email_reply_to: "noreply@mob.lan" - -config :mobilizon, Mobilizon.Storage.Repo, - adapter: Ecto.Adapters.Postgres, - username: "mobilizon", - password: "hnGe9CpuHffYU--_daUDEyRScKSU9abpTz0FhG2pYXQPyPWSPX8mnzo56wPNfesD", - database: "mobilizon_prod", - hostname: "localhost", - port: "5432", - pool_size: 10 diff --git a/js/public/img/icons/android-chrome-192x192 (copie).png b/js/public/img/icons/android-chrome-192x192 (copie).png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/android-chrome-192x192.png b/js/public/img/icons/android-chrome-192x192.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/android-chrome-512x512.png b/js/public/img/icons/android-chrome-512x512.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/android-chrome-maskable-512x512.png b/js/public/img/icons/android-chrome-maskable-512x512.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/apple-touch-icon-120x120.png b/js/public/img/icons/apple-touch-icon-120x120.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/apple-touch-icon-152x152.png b/js/public/img/icons/apple-touch-icon-152x152.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/apple-touch-icon-180x180.png b/js/public/img/icons/apple-touch-icon-180x180.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/apple-touch-icon-60x60.png b/js/public/img/icons/apple-touch-icon-60x60.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/apple-touch-icon-76x76.png b/js/public/img/icons/apple-touch-icon-76x76.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/apple-touch-icon.png b/js/public/img/icons/apple-touch-icon.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/favicon-16x16.png b/js/public/img/icons/favicon-16x16.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/favicon-32x32.png b/js/public/img/icons/favicon-32x32.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/icon-128x128.png b/js/public/img/icons/icon-128x128.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/icon-384x384.png b/js/public/img/icons/icon-384x384.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/icon-512x512.png b/js/public/img/icons/icon-512x512.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/icon-96x96.png b/js/public/img/icons/icon-96x96.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/msapplication-icon-144x144.png b/js/public/img/icons/msapplication-icon-144x144.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/mstile-150x150.png b/js/public/img/icons/mstile-150x150.png old mode 100644 new mode 100755 diff --git a/js/public/img/icons/safari-pinned-tab.svg b/js/public/img/icons/safari-pinned-tab.svg old mode 100644 new mode 100755 diff --git a/js/public/img/koena-a11y.svg b/js/public/img/koena-a11y.svg old mode 100644 new mode 100755 diff --git a/js/public/img/mobilizon_default_card.png b/js/public/img/mobilizon_default_card.png old mode 100644 new mode 100755 diff --git a/js/public/img/mobilizon_logo.png b/js/public/img/mobilizon_logo.png old mode 100644 new mode 100755 diff --git a/js/public/img/pics/Heidelberg_Altstadt_Schloss_Luftbild.jpg b/js/public/img/pics/Heidelberg_Altstadt_Schloss_Luftbild.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/Mairie_Montrouge.jpeg b/js/public/img/pics/Mairie_Montrouge.jpeg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/SOTM_2019_Group_Photo.jpg b/js/public/img/pics/SOTM_2019_Group_Photo.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/cartoparty_versailles_accessibility.jpeg b/js/public/img/pics/cartoparty_versailles_accessibility.jpeg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/error.jpg b/js/public/img/pics/error.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/event_creation.jpg b/js/public/img/pics/event_creation.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/footer_1.jpg b/js/public/img/pics/footer_1.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/footer_2.jpg b/js/public/img/pics/footer_2.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/footer_3.jpg b/js/public/img/pics/footer_3.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/footer_4.jpg b/js/public/img/pics/footer_4.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/footer_5.jpg b/js/public/img/pics/footer_5.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/group.jpg b/js/public/img/pics/group.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/homepage.jpg b/js/public/img/pics/homepage.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/homepage_background.png b/js/public/img/pics/homepage_background.png old mode 100644 new mode 100755 diff --git a/js/public/img/pics/lyon.jpeg b/js/public/img/pics/lyon.jpeg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/lyon_photo.jpeg b/js/public/img/pics/lyon_photo.jpeg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/realisation.jpg b/js/public/img/pics/realisation.jpg old mode 100644 new mode 100755 diff --git a/js/public/img/pics/rose.jpg b/js/public/img/pics/rose.jpg old mode 100644 new mode 100755