1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dotclear2_ynh.git synced 2024-09-03 18:26:29 +02:00

Swapped SSO reload and curl setup to fix the private install

This commit is contained in:
Rémy Garrigue 2015-09-11 17:33:07 +02:00
parent 796248311a
commit 3441a93c0c

View file

@ -59,14 +59,15 @@ then
sudo yunohost app setting $app unprotected_uris -v "/" sudo yunohost app setting $app unprotected_uris -v "/"
fi fi
# Reload Nginx and regenerate SSOwat conf
sudo /etc/init.d/nginx reload
sudo yunohost app ssowatconf
# Setting first user details and filling database calling admin/install/index.php # Setting first user details and filling database calling admin/install/index.php
success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -F "u_email=$email" -F "u_firstname=$firstname" -F "u_name=$lastname" -F "u_login=$admin" -F "u_pwd=$admin_password" -F "u_pwd2=$admin_password" -F "u_date=$timezone" https://$domain$path/admin/install/index.php` success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -F "u_email=$email" -F "u_firstname=$firstname" -F "u_name=$lastname" -F "u_login=$admin" -F "u_pwd=$admin_password" -F "u_pwd2=$admin_password" -F "u_date=$timezone" https://$domain$path/admin/install/index.php`
# success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -H 'Host: $domain' -X POST --data '?u_email=$EMAIL&u_firstname=$FIRSTNAME&u_name=$NAME&u_login=$LOGIN&u_pwd=$admin_password&u_pwd2=$admin_password&u_date=$timezone' https://$domain$path/admin/install/index.php` # success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -H 'Host: $domain' -X POST --data '?u_email=$EMAIL&u_firstname=$FIRSTNAME&u_name=$NAME&u_login=$LOGIN&u_pwd=$admin_password&u_pwd2=$admin_password&u_date=$timezone' https://$domain$path/admin/install/index.php`
# Now that we curl'ed the setup we can lock the UI if it's private
# Reload Nginx and regenerate SSOwat conf
sudo /etc/init.d/nginx reload
sudo yunohost app ssowatconf
# Success or not success # Success or not success
if [ `echo $success | grep -c success` -gt 0 ] if [ `echo $success | grep -c success` -gt 0 ]
then then