1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/funkwhale_ynh.git synced 2024-09-03 18:36:24 +02:00

Merge pull request #24 from YunoHost-Apps/testing

Add https to FUNKWHALE_URL
This commit is contained in:
Jean-Baptiste 2018-07-04 23:10:25 +02:00 committed by GitHub
commit 11c81c1f50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 11 deletions

View file

@ -38,7 +38,7 @@ FUNKWHALE_API_PORT=__PORT__
# Replace this by the definitive, public domain you will use for # Replace this by the definitive, public domain you will use for
# your instance # your instance
FUNKWHALE_URL=__DOMAIN__ FUNKWHALE_URL=https://__DOMAIN__
# Configure email sending using this variale # Configure email sending using this variale
# By default, funkwhale will output emails sent to stdout # By default, funkwhale will output emails sent to stdout

View file

@ -8,7 +8,7 @@
"description": { "description": {
"en": "A modern, convivial and free music server" "en": "A modern, convivial and free music server"
}, },
"version": "0.15~ynh1", "version": "0.15~ynh2",
"url": "https://funkwhale.audio", "url": "https://funkwhale.audio",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"maintainer": { "maintainer": {

View file

@ -70,10 +70,6 @@ ynh_app_setting_set "$app" port "$port"
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES
#================================================= #=================================================
# add backports (required to install ffmpeg)
echo "deb http://httpredir.debian.org/debian stretch-backports main" | tee /etc/apt/sources.list.d/stretch-backports.list
ynh_package_update
ynh_install_app_dependencies build-essential curl ffmpeg \ 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 \ redis-server \

View file

@ -35,11 +35,9 @@ if [ -z "$redis_db" ]; then
ynh_app_setting_set "$app" redis_db "$redis_db" ynh_app_setting_set "$app" redis_db "$redis_db"
fi fi
# Make sure we use stretch backports and not jessie's # We don't need backports anymore
if [ ! -f /etc/apt/sources.list.d/stretch-backports.list ]; then ynh_secure_remove /etc/apt/sources.list.d/stretch-backports.list
echo "deb http://httpredir.debian.org/debian stretch-backports main" | tee /etc/apt/sources.list.d/stretch-backports.list
ynh_secure_remove /etc/apt/sources.list.d/jessie-backports.list ynh_secure_remove /etc/apt/sources.list.d/jessie-backports.list
fi
#================================================= #=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP