Просмотр исходного кода

Update upgrade for importing without sso

Mickael-Martin 7 лет назад
Родитель
Сommit
6010120f83
1 измененных файлов с 16 добавлено и 1 удалено
  1. 16 1
      scripts/upgrade

+ 16 - 1
scripts/upgrade

@@ -67,6 +67,9 @@ fi
 #=================================================
 #=================================================
 # Import Yunohost template
 # Import Yunohost template
 #=================================================
 #=================================================
+#disable sso temporaly
+ynh_app_setting_set $app unprotected_uris "/"
+systemctl reload nginx
 zabbixFullpath=https://$domain$path_url
 zabbixFullpath=https://$domain$path_url
 localpath=$(find /var/cache/yunohost/ -name "Template_Yunohost.xml")
 localpath=$(find /var/cache/yunohost/ -name "Template_Yunohost.xml")
 sudoUserPpath=$(find /var/cache/yunohost/ -name "etc_sudoers.d_zabbix")
 sudoUserPpath=$(find /var/cache/yunohost/ -name "etc_sudoers.d_zabbix")
@@ -212,8 +215,20 @@ then
 	    cp -pf /tmp/zabbix.conf.php /usr/share/zabbix/conf/
 	    cp -pf /tmp/zabbix.conf.php /usr/share/zabbix/conf/
 	    
 	    
 	    rm -fr /tmp/zabbix*
 	    rm -fr /tmp/zabbix*
-    
+	    
+	    #=================================================
+        # SETUP SSOWAT
+        #=================================================
+        
+        # Make app public if necessary
+        if [ $is_public -eq 1 ]
+        then
+        	# unprotected_uris allows SSO credentials to be passed anyway.
+        	ynh_app_setting_set $app unprotected_uris "/"
+        fi
+
 	    systemctl reload nginx
 	    systemctl reload nginx
+	    yunohost app ssowatconf
 	else
 	else
 		ynh_print_info "No update from repo ! (Already up to date)"
 		ynh_print_info "No update from repo ! (Already up to date)"
 	fi
 	fi