diff --git a/conf/geolix.exs b/conf/geolix.exs deleted file mode 100644 index 53c8223..0000000 --- a/conf/geolix.exs +++ /dev/null @@ -1,8 +0,0 @@ -config :geolix, - databases: [ - %{ - id: :city, - adapter: Geolix.Adapter.MMDB2, - source: "__DATADIR__/geo/dbip-city-lite-2021-07.mmdb" - } - ] \ No newline at end of file diff --git a/conf/geolix.src b/conf/geolix.src deleted file mode 100644 index 9688b97..0000000 --- a/conf/geolix.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://download.db-ip.com/free/dbip-city-lite-2021-07.mmdb.gz -SOURCE_SUM=646a612147dfeedba438d0752b82bee969ca8c315c0f497ca05192cbcc42a20e -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=dbip-city-lite-2021-07.mmdb.gz -SOURCE_EXTRACT=true diff --git a/scripts/install b/scripts/install index aea46fd..7e698da 100644 --- a/scripts/install +++ b/scripts/install @@ -149,8 +149,6 @@ ynh_app_setting_set --app=$app --key=datadir --value=$datadir mkdir -p $datadir mkdir -p "$datadir/uploads/" -ynh_setup_source --dest_dir="$datadir/geo" - chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:$app "$datadir" @@ -186,9 +184,6 @@ cat "../conf/mail.exs" >> "$config" ynh_replace_string --match_string="__DATADIR__" --replace_string="$datadir" --target_file="../conf/uploads.exs" cat "../conf/uploads.exs" >> "$config" -ynh_replace_string --match_string="__DATADIR__" --replace_string="$datadir" --target_file="../conf/geolix.exs" -cat "../conf/geolix.exs" >> "$config" -ynh_setup_source --dest_dir="$datadir/geo" chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:$app "$datadir" diff --git a/scripts/upgrade b/scripts/upgrade index dd0ef53..d26946d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,6 +49,7 @@ ynh_script_progression --message="Backing up the app before upgrading (may take # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { + read -p "key" ynh_clean_check_starting # Restore it if the upgrade fails ynh_restore_upgradebackup @@ -156,29 +157,6 @@ if [ ! -f "$final_path/$app/config/runtime.exs" ]; then ynh_store_file_checksum --file="$final_path/$app/config/runtime.exs" fi -# If geo folder doesn't exist, create it -if [ -z "$datadir/geo" ]; then - ynh_script_progression --message="Create geo folder..." - - ynh_setup_source --dest_dir="$datadir/geo" - - chmod 750 "$datadir" - chmod -R o-rwx "$datadir" - chown -R $app:$app "$datadir" - - config="$final_path/$app/config/runtime.exs" - - ynh_backup_if_checksum_is_different --file="$config" - - ynh_replace_string --match_string="__DATADIR__" --replace_string="$datadir" --target_file="../conf/geolix.exs" - cat "../conf/geolix.exs" >> "$config" - - ynh_store_file_checksum --file="$config" - - chmod 400 "$config" - chown $app:$app "$config" -fi - #================================================= # CREATE DEDICATED USER #=================================================