1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pleroma_ynh.git synced 2024-09-03 20:15:59 +02:00

Merge pull request #46 from YunoHost-Apps/testing

Moving from 0.9.9 to master branch
This commit is contained in:
yalh76 2019-03-03 21:56:00 +01:00 committed by GitHub
commit c7a386a3ff
6 changed files with 13 additions and 11 deletions

View file

@ -41,5 +41,5 @@
Level 9=0
Level 10=0
;;; Options
Email=anmol@datamol.org
Email=anmol@datamol.org;yalh@yahoo.com
Notification=yes

View file

@ -1,6 +0,0 @@
SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/v0.9.9/pleroma-v0.9.9.tar.gz
SOURCE_SUM=21a25c34cfd9399e6b2feed570ea67f1f61a14304fadabb0283a03724b076a5f
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=

View file

@ -6,7 +6,7 @@
"en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon",
"fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon"
},
"version": "0.9.9~ynh1",
"version": "0.9.9~ynh2",
"url": "https://git.pleroma.social/pleroma/pleroma",
"license": "AGPL-3.0-only",
"maintainer": {

View file

@ -174,7 +174,10 @@ ynh_print_info "Setting up source files ..."
ynh_app_setting_set $app final_path $final_path
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source "$final_path/$app"
git clone https://git.pleroma.social/pleroma/pleroma "$final_path/$app"
pushd $final_path/$app
git checkout -b master
popd
#=================================================
# NGINX CONFIGURATION

View file

@ -59,7 +59,7 @@ ynh_psql_execute_as_root "\connect $db_name
SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$db_name';"
# Remove a database if it exists, along with the associated user
ynh_psql_remove_db "$db_name" "$app"
ynh_psql_remove_db "$db_name" "$db_name"
#=================================================
# REMOVE DEPENDENCIES

View file

@ -109,7 +109,12 @@ path_url=$(ynh_normalize_url_path $path_url)
ynh_print_info "Upgrading source files..."
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source "$final_path/$app"
git clone --quiet https://git.pleroma.social/pleroma/pleroma "$final_path/upgrade"
pushd "$final_path/upgrade"
git checkout -b master
popd
cp -a "$final_path/upgrade/." "$final_path/$app/."
rm -r "$final_path/upgrade"
#=================================================
# NGINX CONFIGURATION