[fix] always public + fix upgrade

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 {

manifest.json

@@ -57,15 +57,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"
 			}
 		]
 	}

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}"
@@ -191,19 +189,6 @@ sudo sed -i "s@__APP__@$app@g" /etc/cron.d/$app
 # Restart crontab
 sudo systemctl restart cron
 
-# 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
 

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,29 +32,22 @@ sudo sed -i "s@__PATH__@$app@g" ../conf/nginx.conf*
 sudo sed -i "s@__FINALPATH__@$final_path/@g" ../conf/nginx.conf*
 
 # Stop Mastodon Services
-sudo systemctl stop /etc/systemd/system/mastodon-*.service
+sudo systemctl stop mastodon-*.service
 
 # Update Mastodon
 sudo su - $app <<COMMANDS
 pushd ~/live
-git pull
-RAILS_ENV=production bin/bundle exec rails db:migrate
-RAILS_ENV=production bin/bundle exec rails assets:precompile
+git fetch
+git pull https://github.com/tootsuite/mastodon.git master
+git checkout v1.2
+bin/bundle install
+yarn install --production
+RAILS_ENV=production bundle exec rails assets:clean
+RAILS_ENV=production bundle exec rails assets:precompile
+RAILS_ENV=production bundle exec rails db:migrate
 COMMANDS
 
-# Start Mastodon Services
-sudo systemctl start /etc/systemd/system/mastodon-*.service
-
-# If app is public, add url to SSOWat conf as skipped_uris
-if [ $is_public = "Yes" ];
-then
-	ynh_app_setting_set "$app" unprotected_uris "/"
-	sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
-else
-	sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
-fi
-
 # Reload Nginx
 sudo systemctl reload nginx
-# Reload Mastodon
-sudo systemctl restart mastodon-*.service
+# Restart Mastodon
+sudo systemctl start mastodon-*.service

sources/source_dir

@@ -1 +1 @@
-mastodon-1.1.1
+mastodon-1.1.2

sources/source_md5

@@ -1 +1 @@
-4bfc3fc2ccc27cc88505cfc0dfb74cac  v1.1.1.zip
+c10055d4250e51eaaf16c78a50390839  mastodon-1.1.2.zip

sources/source_url

@@ -1 +1 @@
-https://github.com/tootsuite/mastodon/archive/v1.1.1.zip
+https://github.com/tootsuite/mastodon/archive/v1.1.2.zip