diff --git a/check_process b/check_process index c929221..6952a12 100644 --- a/check_process +++ b/check_process @@ -2,27 +2,26 @@ auto_remove=1 ; Manifest domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public="Yes" (PUBLIC|public=Yes|private=No) admin="john" (USER) - + path="/path" (PATH) + passwd="adminpassword" ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 - setup_private=1 - setup_public=1 + setup_private=0 + setup_public=0 upgrade=1 backup_restore=1 - multi_instance=1 - wrong_user=1 - wrong_path=1 - incorrect_path=1 - corrupt_source=1 - fail_download_source=1 - port_already_use=1 - final_path_already_use=1 + multi_instance=0 + wrong_user=0 + wrong_path=0 + incorrect_path=0 + corrupt_source=0 + fail_download_source=0 + port_already_use=0 + final_path_already_use=0 ;;; Levels Level 1=auto Level 2=auto diff --git a/conf/nginx.conf b/conf/nginx.conf index 5ce3d7a..d8f0904 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,8 +6,8 @@ location / { try_files $uri @proxy; - #--PRIVATE--# Include SSOWAT user panel. - #--PRIVATE--include conf.d/yunohost_panel.conf.inc; + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } location @proxy { diff --git a/manifest.json b/manifest.json index b9764b6..bccfc30 100644 --- a/manifest.json +++ b/manifest.json @@ -70,15 +70,6 @@ }, "choices": ["en_EN", "fr_FR"], "default": "fr_FR" - }, - { - "name": "is_public", - "ask": { - "en": "Mastodon is it public?", - "fr": "Mastodon est-il public ?" - }, - "choices": ["Yes", "No"], - "default": "Yes" } ] } diff --git a/scripts/backup b/scripts/backup index 2ef6b86..0ea98a6 100644 --- a/scripts/backup +++ b/scripts/backup @@ -18,7 +18,7 @@ ynh_backup "$final_path" "sources" 1 # Copy the nginx conf files ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" -ynh_backup "/etc/cron.d/${app}.conf" "cron.conf" +ynh_backup "/etc/cron.d/${app}" "cron.conf" ynh_backup "/etc/systemd/system/mastodon-web.service" "systemd_web.service" ynh_backup "/etc/systemd/system/mastodon-sidekiq.service" "systemd_sidekiq.service" ynh_backup "/etc/systemd/system/mastodon-streaming.service" "systemd_streaming.service" diff --git a/scripts/install b/scripts/install index 318d18a..4637c3e 100644 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,6 @@ domain=$YNH_APP_ARG_DOMAIN admin_mastodon=$YNH_APP_ARG_ADMIN admin_pass=$YNH_APP_ARG_PASSWD language=$YNH_APP_ARG_LANGUAGE -is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME @@ -33,7 +32,6 @@ ynh_app_setting_set $app domain $domain ynh_app_setting_set $app admin $admin_mastodon ynh_app_setting_set $app pass $admin_pass ynh_app_setting_set $app language $language -ynh_app_setting_set $app is_public $is_public # Create user unix sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password --disabled-login @@ -94,7 +92,7 @@ CLONECOMMANDS # Be king rewind (/var/cache/yunohost/from_file/scripts) popd -# Get Mastodon last version +# # Get Mastodon last version # sudo mkdir "${final_path}/live" # SETUP_SOURCE # sudo chown -R $app: "${final_path}" @@ -195,19 +193,6 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf sudo cp ../conf/crontab_mastodon /etc/cron.d/$app sudo sed -i "s@__APP__@$app@g" /etc/cron.d/$app -# Private or not -if [ "$is_public" = "Yes" ]; -then - sudo sed -i "s@#--PRIVATE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf -fi - -# Setup SSOwat -ynh_app_setting_set "$app" is_public "$is_public" -if [ "$is_public" = "Yes" ]; -then - ynh_app_setting_set "$app" unprotected_uris "/" -fi - # Reload SSOwat configuration sudo yunohost app ssowatconf diff --git a/scripts/upgrade b/scripts/upgrade index b15d9af..4fc1143 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,12 +13,12 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get "$app" domain) path=$(ynh_app_setting_get "$app" path) admin=$(ynh_app_setting_get "$app" admin) -is_public=$(ynh_app_setting_get "$app" is_public) +language=$(ynh_app_setting_get "$app" language) CHECK_PATH # Checks and corrects the syntax of the path. # Check if admin is not null -if [[ "$admin" = "" || "$is_public" = "" || "$language" = "" ]]; then +if [[ "$admin" = "" || "$language" = "" ]]; then echo "Unable to upgrade, please contact support" ynh_die fi @@ -32,11 +32,16 @@ sudo sed -i "s@__PATH__@$app@g" ../conf/nginx.conf* sudo sed -i "s@__FINALPATH__@$final_path/@g" ../conf/nginx.conf* # Stop Mastodon Services +<<<<<<< HEAD sudo systemctl stop mastodon-* +======= +sudo systemctl stop mastodon-*.service +>>>>>>> refs/remotes/YunoHost-Apps/master # Update Mastodon sudo su - $app <>>>>>> refs/remotes/YunoHost-Apps/master # Reload Nginx sudo systemctl reload nginx -# Reload Mastodon -sudo systemctl restart mastodon-*.service +# Restart Mastodon +sudo systemctl start mastodon-*.service \ No newline at end of file diff --git a/sources/source_dir b/sources/source_dir index bc6770c..e582ada 100644 --- a/sources/source_dir +++ b/sources/source_dir @@ -1 +1 @@ -mastodon-1.1.1 \ No newline at end of file +mastodon-1.1.2 \ No newline at end of file diff --git a/sources/source_md5 b/sources/source_md5 index feef915..bd6d5ab 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -4bfc3fc2ccc27cc88505cfc0dfb74cac v1.1.1.zip \ No newline at end of file +c10055d4250e51eaaf16c78a50390839 mastodon-1.1.2.zip \ No newline at end of file diff --git a/sources/source_url b/sources/source_url index 198fec9..7638312 100644 --- a/sources/source_url +++ b/sources/source_url @@ -1 +1 @@ -https://github.com/tootsuite/mastodon/archive/v1.1.1.zip \ No newline at end of file +https://github.com/tootsuite/mastodon/archive/v1.1.2.zip \ No newline at end of file