From 4732c45d42b50242ef07d4d74e1e692087f69364 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 27 Feb 2023 23:14:35 +0100
Subject: [PATCH] fix

---
 conf/.env.production | 122 -------------------------------------------
 manifest.toml        |   7 +--
 scripts/install      |   1 -
 3 files changed, 1 insertion(+), 129 deletions(-)

diff --git a/conf/.env.production b/conf/.env.production
index da24a8b..791e860 100644
--- a/conf/.env.production
+++ b/conf/.env.production
@@ -16,8 +16,6 @@ export UPLOAD_FOLDER=/home/yunohost.app/__APP__/data
 export DATABASE_URL=postgresql://__DB_USER__:__DB_PWD__@:5432/__DB_NAME__
 # export DATABASE_DISABLE_POOLING=
 
-
-
 # Redis (required for API rate limits and email sending)
 # export REDIS_URL=redis://127.0.0.1:6379/__REDIS_DB__
 
@@ -41,123 +39,3 @@ export SENDER_EMAIL=
 # export WEATHER_API_PROVIDER=visualcrossing 
 # export WEATHER_API_KEY=
 
-
-
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY="__KEY__"
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG=false
-USE_HTTPS=true
-
-DOMAIN=__DOMAIN__
-
-# Instance default language (see options at bookwyrm/settings.py "LANGUAGES"
-LANGUAGE_CODE="__LANGUAGE__"
-# Used for deciding which editions to prefer
-DEFAULT_LANGUAGE="English"
-
-## Leave unset to allow all hosts
-#ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
-
-MEDIA_ROOT=__INSTALL_DIR__/images/
-
-# Database configuration
-PGPORT=5432
-POSTGRES_PASSWORD=__DB_PWD__
-POSTGRES_USER=__DB_USER__
-POSTGRES_DB=__DB_NAME__
-POSTGRES_HOST=localhost
-
-# Redis activity stream manager
-MAX_STREAM_LENGTH=200
-REDIS_ACTIVITY_HOST=localhost
-REDIS_ACTIVITY_PORT=6379
-REDIS_ACTIVITY_PASSWORD=
-# Optional, use a different redis database (defaults to 0)
-# REDIS_ACTIVITY_DB_INDEX=0
-
-# Redis as celery broker
-REDIS_BROKER_HOST=localhost
-REDIS_BROKER_PORT=6379
-REDIS_BROKER_PASSWORD=
-# Optional, use a different redis database (defaults to 0)
-# REDIS_BROKER_DB_INDEX=0
-
-# Monitoring for celery
-FLOWER_PORT=8888
-FLOWER_USER=admin
-FLOWER_PASSWORD=changeme
-
-# Email config
-EMAIL_HOST=localhost
-EMAIL_PORT=587
-EMAIL_HOST_USER=__ADMIN_MAIL__
-EMAIL_HOST_PASSWORD=
-EMAIL_USE_TLS=true
-EMAIL_USE_SSL=false
-EMAIL_SENDER_NAME=__ADMIN_MAIL__
-# defaults to DOMAIN
-#EMAIL_SENDER_DOMAIN=
-
-# Query timeouts
-SEARCH_TIMEOUT=5
-QUERY_TIMEOUT=5
-
-# Thumbnails Generation
-ENABLE_THUMBNAIL_GENERATION=false
-
-# S3 configuration
-USE_S3=false
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-
-# Commented are example values if you use a non-AWS, S3-compatible service
-# AWS S3 should work with only AWS_STORAGE_BUCKET_NAME and AWS_S3_REGION_NAME
-# non-AWS S3-compatible services will need AWS_STORAGE_BUCKET_NAME,
-# along with both AWS_S3_CUSTOM_DOMAIN and AWS_S3_ENDPOINT_URL
-
-# AWS_STORAGE_BUCKET_NAME=        # "example-bucket-name"
-# AWS_S3_CUSTOM_DOMAIN=None       # "example-bucket-name.s3.fr-par.scw.cloud"
-# AWS_S3_REGION_NAME=None         # "fr-par"
-# AWS_S3_ENDPOINT_URL=None        # "https://s3.fr-par.scw.cloud"
-
-
-# Preview image generation can be computing and storage intensive
-ENABLE_PREVIEW_IMAGES=False
-
-# Specify RGB tuple or RGB hex strings,
-# or use_dominant_color_light / use_dominant_color_dark
-PREVIEW_BG_COLOR=use_dominant_color_light
-# Change to #FFF if you use use_dominant_color_dark
-PREVIEW_TEXT_COLOR=#363636
-PREVIEW_IMG_WIDTH=1200
-PREVIEW_IMG_HEIGHT=630
-PREVIEW_DEFAULT_COVER_COLOR=#002549
-
-# Below are example keys if you want to enable automatically
-# sending telemetry to an OTLP-compatible service. Many of
-# the main monitoring apps have OLTP collectors, including
-# NewRelic, DataDog, and Honeycomb.io - consult their
-# documentation for setup instructions, and what exactly to
-# put below!
-#
-# Service name is an arbitrary tag that is attached to any
-# data sent, used to distinguish different sources. Useful
-# for sending prod and dev metrics to the same place and
-# keeping them separate, for instance!
-
-# API endpoint for your provider
-OTEL_EXPORTER_OTLP_ENDPOINT=
-# Any headers required, usually authentication info
-OTEL_EXPORTER_OTLP_HEADERS=
-# Service name to identify your app
-OTEL_SERVICE_NAME=
-
-# Set HTTP_X_FORWARDED_PROTO ONLY to true if you know what you are doing.
-# Only use it if your proxy is "swallowing" if the original request was made
-# via https. Please refer to the Django-Documentation and assess the risks
-# for your instance:
-# https://docs.djangoproject.com/en/3.2/ref/settings/#secure-proxy-ssl-header
-HTTP_X_FORWARDED_PROTO=false
diff --git a/manifest.toml b/manifest.toml
index 28fabf9..944c51c 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -40,12 +40,7 @@ ram.runtime = "50M"
     # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "user"
 
-    [install.weather_api_key]
-    ask.en = "visualcrossing api key for the weather data"
-    ask.fr = "Clé API visualcrossing pour les données météos"
-    type = "string"
-
-[resources]
+  [resources]
     [resources.system_user]
 
     [resources.install_dir]
diff --git a/scripts/install b/scripts/install
index 7125ff2..3e3d09d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,7 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-weather_api_key=$(ynh_string_random --length=32)
 
 #=================================================
 # INSTALL DEPENDENCIES