diff --git a/README.md b/README.md index 2cf4901..2f75a7e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # funkwhale_ynh A modern, convivial and free music server on YunoHost -Warning: installation has to be done on root for now. I'm working on enabling it in subpath. \ No newline at end of file +Installation has to be done on root for now. I'm working on enabling it in subpath. + +Admin passwork is **funkwhale**, login is what you provied at installation. \ No newline at end of file diff --git a/conf/env.prod b/conf/env.prod index d453a65..2d8bb70 100644 --- a/conf/env.prod +++ b/conf/env.prod @@ -72,7 +72,7 @@ DATABASE_URL=postgresql://__DBUSER__:__DBPWD__@:5432/__DBNAME__ # CACHE_URL=redis://:/ # CACHE_URL=redis://localhost:6379/0 # Use the next one if you followed Debian installation guide -# CACHE_URL=redis://127.0.0.1:6379/0 +CACHE_URL=redis://127.0.0.1:6379/__APP__ # Where media files (such as album covers or audio tracks) should be stored # on your system? diff --git a/manifest.json b/manifest.json index ef153b1..f8d3dfe 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "yunohost": ">= 3.0.0~beta1.2" }, "description": { - "en": "A translation platform using Git and Python" + "en": "A modern, convivial and free music server" }, "version": "0.12.0-1", "url": "https://funkwhale.audio", diff --git a/scripts/install b/scripts/install index 760e485..4c5548e 100644 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,8 @@ echo "deb http://httpredir.debian.org/debian jessie-backports main" | tee /etc/a ynh_package_update ynh_install_app_dependencies build-essential curl ffmpeg \ - libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv + libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \ + redis-server #================================================= # CREATE A PostgreSQL DATABASE @@ -162,6 +163,7 @@ key=$(ynh_string_random) ynh_app_setting_set "$app" key "$key" +ynh_replace_string "__APP__" "$app" "$configfile" ynh_replace_string "__PORT__" "$port" "$configfile" ynh_replace_string "__DOMAIN__" "$domain" "$configfile" ynh_replace_string "__DBUSER__" "$db_name" "$configfile" diff --git a/scripts/remove b/scripts/remove index 07f9c84..6692185 100644 --- a/scripts/remove +++ b/scripts/remove @@ -35,13 +35,6 @@ ynh_remove_systemd_config "$app-beat" systemctl stop "$app".target ynh_secure_remove "/etc/systemd/system/$app.target" -#================================================= -# REMOVE DEPENDENCIES -#================================================= - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE THE PostgreSQL DATABASE #================================================= diff --git a/scripts/restore b/scripts/restore index 371c112..556748e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -73,7 +73,8 @@ ynh_system_user_create "$app" #================================================= ynh_install_app_dependencies build-essential curl ffmpeg \ - libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv + libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \ + redis-server #================================================= # RESTORE THE PostgreSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index c91549f..35a7f47 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,8 +97,17 @@ ynh_add_nginx_config # Create a system user ynh_system_user_create "$app" +#================================================= +# INSTALL DEPENDENCIES +#================================================= + +ynh_install_app_dependencies build-essential curl ffmpeg \ + libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \ + redis-server + #================================================= # SPECIFIC UPGRADE +#================================================= # PYTHON DEPENDENCIES #================================================= @@ -125,6 +134,7 @@ key=$(ynh_string_random) ynh_app_setting_set "$app" key "$key" +ynh_replace_string "__APP__" "$app" "$configfile" ynh_replace_string "__PORT__" "$port" "$configfile" ynh_replace_string "__DOMAIN__" "$domain" "$configfile" ynh_replace_string "__DBUSER__" "$db_name" "$configfile"