diff --git a/conf/app.src b/conf/app.src index c276e1d..81f1cb6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://files.spip.net/spip/archives/SPIP-v3.2.3.zip -SOURCE_SUM=6211907d4275cfc8131a10c6222e7f13b2d75a355b94e95cd442f2aa80816fc9 +SOURCE_SUM=b20154843a8fe2756966548145fc1f52e9c19a43c82248f9a89b868efda2b11e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 62b7063..82554c3 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php5-fpm", + "php7.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/install b/scripts/install index c14505e..ee466b8 100644 --- a/scripts/install +++ b/scripts/install @@ -123,24 +123,25 @@ ynh_print_info "Finalizing installation..." ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=chmod" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=2" "chmod=755" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "choix_db=$db_name" "tprefix=$db_name" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap1" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap2" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap3" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap4" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" - -# statut_ldap can take: 0minirezo for Administrator, 1comite for Editor, 6forum for Visitor -if [ $users_status = "Administrator" ]; then - status="0minirezo" -elif [ $users_status = "Editor" ]; then - status="1comite" -else - status="6forum" -fi -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap5" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" "statut_ldap=$status" "ldap_login=sAMAccountName,uid,login,userid,cn,sn" "ldap_nom=cn" "ldap_email=mail" "ldap_bio=description" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "ldap_present=true" +# For now spip have a problem with LDAP +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap1" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap2" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap3" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap4" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" +# +## statut_ldap can take: 0minirezo for Administrator, 1comite for Editor, 6forum for Visitor +#if [ $users_status = "Administrator" ]; then +# status="0minirezo" +#elif [ $users_status = "Editor" ]; then +# status="1comite" +#else +# status="6forum" +#fi +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap5" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" "statut_ldap=$status" "ldap_login=sAMAccountName,uid,login,userid,cn,sn" "ldap_nom=cn" "ldap_email=mail" "ldap_bio=description" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "ldap_present=true" email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n') -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=\"$email\"" "login=$admin" "pass=$password" "pass_verif=$password" +ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin" # Remove the public access @@ -152,7 +153,7 @@ fi # MODIFY A CONFIG FILE #================================================= -ynh_replace_string "'','utf8');" "'ldap.php','utf8');" $final_path/config/connect.php +#ynh_replace_string "'','utf8');" "'ldap.php','utf8');" $final_path/config/connect.php cp ../conf/mes_options.php $final_path/config/mes_options.php #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c62a72c..e7c2eda 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,24 +147,25 @@ ynh_secure_remove "$final_path/config/connect.php" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=chmod" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=2" "chmod=755" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "choix_db=$db_name" "tprefix=$db_name" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap1" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap2" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap3" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap4" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" - -# statut_ldap can take: 0minirezo for Administrator, 1comite for Editor, 6forum for Visitor -if [ $users_status = "Administrator" ]; then - status="0minirezo" -elif [ $users_status = "Editor" ]; then - status="1comite" -else - status="6forum" -fi -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap5" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" "statut_ldap=$status" "ldap_login=sAMAccountName,uid,login,userid,cn,sn" "ldap_nom=cn" "ldap_email=mail" "ldap_bio=description" -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "ldap_present=true" +# For now spip have a problem with LDAP +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap1" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap2" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap3" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap4" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" +# +## statut_ldap can take: 0minirezo for Administrator, 1comite for Editor, 6forum for Visitor +#if [ $users_status = "Administrator" ]; then +# status="0minirezo" +#elif [ $users_status = "Editor" ]; then +# status="1comite" +#else +# status="6forum" +#fi +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap5" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" "statut_ldap=$status" "ldap_login=sAMAccountName,uid,login,userid,cn,sn" "ldap_nom=cn" "ldap_email=mail" "ldap_bio=description" +#ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "ldap_present=true" email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n') -ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=\"$email\"" "login=$admin" "pass=$password" "pass_verif=$password" +ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin" # Remove the public access @@ -177,7 +178,7 @@ fi # MODIFY A CONFIG FILE #================================================= -ynh_replace_string "'','utf8');" "'ldap.php','utf8');" $final_path/config/connect.php +#ynh_replace_string "'','utf8');" "'ldap.php','utf8');" $final_path/config/connect.php cp ../conf/mes_options.php $final_path/config/mes_options.php #=================================================