From b1b0ea429996844d4a30badad2cd5d8f167ecaa1 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Mon, 29 Aug 2016 16:55:20 +0200 Subject: [PATCH 01/97] Update package + install --- README.md | 5 +++++ manifest.json | 8 ++++++-- scripts/install | 4 ++-- scripts/upgrade | 25 ------------------------- 4 files changed, 13 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 4728c86..02ede76 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,11 @@ ## Spip for YunoHost +Version 1.0.2 (29/08/16) + +- Fix Packaging [Source](https://forum.yunohost.org/t/news-about-app-management-and-packaging-in-yunohost-2-4/1379/1) +- Update SPIP Version + Version 1.0.1 (04/01/16) - Delete SPIP sources diff --git a/manifest.json b/manifest.json index bc14a50..a0ab0df 100644 --- a/manifest.json +++ b/manifest.json @@ -1,15 +1,19 @@ { "name": "SPIP", + "packaging_format": 1, "id": "spip", "description": { "en": "SPIP - publishing system for the Internet", "fr": "SPIP - Système de publication pour l’Internet" }, "license": "GPL-3", - "developer": { + "maintainer": { "name": "cyp", "email": "cyp@rouquin.me", - "url": "http://rouquin.me" + "url": "http://www.rouquin.me" + }, + "requirements": { + "yunohost": ">> 2.4.0" }, "url": "http://www.spip.net/", "multi_instance": "true", diff --git a/scripts/install b/scripts/install index 33f3fdb..782b173 100644 --- a/scripts/install +++ b/scripts/install @@ -31,8 +31,8 @@ sudo yunohost app setting spip mysqlpwd -v $db_pwd # Download and extract files to the right place final_path=/var/www -wget http://files.spip.org/spip/stable/spip-3.0.zip -unzip spip-3.0.zip -d $final_path +wget http://files.spip.org/spip/stable/spip-3.1.zip +unzip spip-3.1.zip -d $final_path # Set permissions to spip directory sudo chown -R www-data: $final_path diff --git a/scripts/upgrade b/scripts/upgrade index d6d6cc8..5431de8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,31 +13,6 @@ final_path=/var/www/spip db_name=spip -# if [[ "$admin_spip" = "" ]]; -# then -# mysql -u root -p$root_pwd $db_name -e "select MAX(user_login) from wp_users where user_status=0 INTO OUTFILE '/tmp/spipuser';" -# admin_spip=$(cat /tmp/spipuser) -# sudo rm -f /tmp/spipuser -# fi - -# if [[ "$language" = "" ]]; -# then -# language=$(sudo grep WPLANG $final_path/wp-config.php | cut -d"'" -f4) -# fi - -# if [[ "$is_public" = "" ]]; -# then -# mysql -u root -p$root_pwd $db_name -e "select option_value from wp_options WHERE option_name='active_plugins' INTO OUTFILE '/tmp/spipispublic';" -# grep -q http-authentication /tmp/spipispublic -# if [[ $? -eq 0 ]]; -# then -# is_public=Yes -# else -# is_public=No -# fi -# sudo rm -f /tmp/spipispublic -# fi - # Check if admin is not null if [[ "$admin_spip" = "" || "$is_public" = "" || "$language" = "" ]]; then echo "Unable to upgrade, please contact support" From 828fa2bdafd296fd9e326f937a77634841e68660 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 30 Aug 2016 00:22:47 +0200 Subject: [PATCH 02/97] Update package --- scripts/install | 28 ++++++++++++------------- scripts/remove | 10 ++++++++- scripts/upgrade | 55 ++++++++++++++++++++++++++++++++++--------------- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/scripts/install b/scripts/install index 782b173..ae9b7f0 100644 --- a/scripts/install +++ b/scripts/install @@ -1,23 +1,21 @@ #!/bin/bash -# Retrieve arguments -domain=$1 -path=$2 -admin_spip=$3 +app=$YNH_APP_INSTANCE_NAME -# Check if admin exists -sudo yunohost user list --json | grep -q "\"username\": \"$admin_spip\"" -if [[ ! $? -eq 0 ]]; then - echo "Wrong admin" - exit 1 -fi -sudo yunohost app setting spip admin -v $admin_spip +# Retrieve arguments +domain=$YNH_APP_ARG_DOMAIN +path=$YNH_APP_ARG_PATH +admin=$YNH_APP_ARG_ADMIN +is_public=$YNH_APP_ARG_IS_PUBLIC +language=$YNH_APP_ARG_LANGUAGE + +ynh_app_setting_set "$app" admin "$admin" +ynh_app_setting_set "$app" is_public "$is_public" +ynh_app_setting_set "$app" language "$language" # Check domain/path availability -sudo yunohost app checkurl $domain$path -a spip -if [[ ! $? -eq 0 ]]; then - exit 1 -fi +sudo yunohost app checkurl "${domain}${path}" -a "$app" \ +|| ynh_die "Path not available: ${domain}${path}" # Generate random DES key & password db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') diff --git a/scripts/remove b/scripts/remove index 826cd18..8119be6 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,9 +1,17 @@ #!/bin/bash +# See comments in install script +app=$YNH_APP_INSTANCE_NAME + +# Source YunoHost helpers +source /usr/share/yunohost/helpers + +# Retrieve app settings +domain=$(ynh_app_setting_get "$app" domain) + db_user=spip db_name=spip root_pwd=$(sudo cat /etc/yunohost/mysql) -domain=$(sudo yunohost app setting spip domain) mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;" sudo rm -rf /var/www/spip diff --git a/scripts/upgrade b/scripts/upgrade index 5431de8..9f25cd5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,11 +1,23 @@ #!/bin/bash -# Retrieve arguments -domain=$(sudo yunohost app setting spip domain) -path=$(sudo yunohost app setting spip path) -admin_spip=$(sudo yunohost app setting spip admin) -language=$(sudo yunohost app setting spip language) -is_public=$(sudo yunohost app setting spip is_public) +# Exit on command errors and treat unset variables as an error +set -eu + +# See comments in install script +app=$YNH_APP_INSTANCE_NAME + +# Source YunoHost helpers +source /usr/share/yunohost/helpers + +# Retrieve app settings +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) + +# Remove trailing "/" for next commands +path=${path%/} root_pwd=$(sudo cat /etc/yunohost/mysql) @@ -15,8 +27,8 @@ db_name=spip # Check if admin is not null if [[ "$admin_spip" = "" || "$is_public" = "" || "$language" = "" ]]; then - echo "Unable to upgrade, please contact support" - exit 1 + echo "Unable to upgrade, please contact support" + exit 1 fi @@ -26,16 +38,25 @@ sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* if [ $is_public = "Yes" ]; then - sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/spip.conf - # grep -q "define('FORCE_SSL_ADMIN', true);" $final_path/wp-config.php - # if [[ ! $? -eq 0 ]]; - # then - # echo "define('FORCE_SSL_ADMIN', true);" | sudo tee -a $final_path/config/connect.php - # else - # sudo sed -i "s@//define('FORCE_SSL_ADMIN@define('FORCE_SSL_ADMIN@g" $final_path/config/connect.php - # fi + sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/spip.conf + # grep -q "define('FORCE_SSL_ADMIN', true);" $final_path/wp-config.php + # if [[ ! $? -eq 0 ]]; + # then + # echo "define('FORCE_SSL_ADMIN', true);" | sudo tee -a $final_path/config/connect.php + # else + # sudo sed -i "s@//define('FORCE_SSL_ADMIN@define('FORCE_SSL_ADMIN@g" $final_path/config/connect.php + # fi else - sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf + sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf +fi + +# If app is public, add url to SSOWat conf as skipped_uris +if [[ $is_public -eq 1 ]]; then + # See install script + ynh_app_setting_set "$app" unprotected_uris "/" + sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/spip.conf +else + sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf fi # Reload Nginx From 4354ac5e627c8d9c73261a061c12943a946a621b Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 01:51:28 +0200 Subject: [PATCH 03/97] Update script --- scripts/.fonctions | 187 +++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 54 ++++++------- scripts/remove | 29 +++---- scripts/upgrade | 21 +++-- sources/source_dir | 1 + sources/source_md5 | 1 + sources/source_url | 1 + 7 files changed, 246 insertions(+), 48 deletions(-) create mode 100644 scripts/.fonctions create mode 100644 sources/source_dir create mode 100644 sources/source_md5 create mode 100644 sources/source_url diff --git a/scripts/.fonctions b/scripts/.fonctions new file mode 100644 index 0000000..9d3e018 --- /dev/null +++ b/scripts/.fonctions @@ -0,0 +1,187 @@ +#!/bin/bash + +ynh_version="2.4" + +YNH_VERSION () { # Renvoi le numéro de version de la moulinette Yunohost + ynh_version=$(sudo yunohost -v | grep "moulinette:" | cut -d' ' -f2 | cut -d'.' -f1,2) +} + +CHECK_VAR () { # Vérifie que la variable n'est pas vide. +# $1 = Variable à vérifier +# $2 = Texte à afficher en cas d'erreur + test -n "$1" || (echo "$2" >&2 && false) +} + +EXIT_PROPERLY () { # Provoque l'arrêt du script en cas d'erreur. Et nettoye les résidus. + trap '' ERR + echo -e "\e[91m \e[1m" # Shell in light red bold + echo -e "!!\n $app install's script has encountered an error. Installation was cancelled.\n!!" >&2 + + CLEAN_SETUP # Appel la fonction de nettoyage spécifique du script install. + + # Compense le bug de ssowat qui ne supprime pas l'entrée de l'app en cas d'erreur d'installation. + sudo sed -i "\@\"$domain$path/\":@d" /etc/ssowat/conf.json + + if [ "$ynh_version" = "2.2" ]; then + /bin/bash $script_dir/remove # Appel le script remove. En 2.2, ce comportement n'est pas automatique. + fi + + exit 1 +} + +TRAP_ON () { # Activate signal capture + trap EXIT_PROPERLY ERR # Capturing exit signals on error +} + +TRAP_OFF () { # Ignoring signal capture until TRAP_ON + # Pour une raison que j'ignore, la fonction TRAP_ON fonctionne très bien. + # Mais pas la fonction TRAP_OFF... + # Utiliser directement `trap '' ERR` dans le code pour l'utiliser, à la place de la fonction. + trap '' ERR # Ignoring exit signals +} + +CHECK_USER () { # Vérifie la validité de l'user admin +# $1 = Variable de l'user admin. + sudo yunohost user list --json | grep -q "\"username\": \"$1\"" || (echo "Wrong admin" >&2 && false) +} + +CHECK_PATH () { # Vérifie la présence du / en début de path. Et son absence à la fin. + if [ "${path:0:1}" != "/" ]; then # Si le premier caractère n'est pas un / + path="/$path" # Ajoute un / en début de path + fi + if [ "${path:${#path}-1}" == "/" ] && [ ${#path} -gt 1 ]; then # Si le dernier caractère est un / et que ce n'est pas le seul caractère. + path="${path:0:${#path}-1}" # Supprime le dernier caractère + fi +} + +CHECK_DOMAINPATH () { # Vérifie la disponibilité du path et du domaine. + sudo yunohost app checkurl $domain$path -a $app +} + +CHECK_FINALPATH () { # Vérifie que le dossier de destination n'est pas déjà utilisé. + final_path=/var/www/$app + if [ -e "$final_path" ] + then + echo "This path already contains a folder" >&2 + false + fi +} + +GENERATE_DB () { # Créer une base de données et un utilisateur dédié au nom de l'app. +# $1 = Nom de la base de donnée + # Génère un mot de passe aléatoire. + db_user=$1 + db_pwd=$(head -n20 /dev/urandom | tr -c -d 'A-Za-z0-9' | head -c20) + CHECK_VAR "$db_pwd" "db_pwd empty" + # Utilise '$app' comme nom d'utilisateur et de base de donnée + # Initialise la base de donnée et stocke le mot de passe mysql. + ynh_mysql_create_db $db_user $db_user $db_pwd + sudo yunohost app setting $app mysqlpwd -v $db_pwd +} + +SETUP_SOURCE () { # Télécharge la source, décompresse et copie dans $final_path +# $1 = Nom de l'archive téléchargée. + wget -nv --show-progress -i ../sources/source_url -O $1 + # Vérifie la somme de contrôle de la source téléchargée. + md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" >&2 && false) + # Décompresse la source + if [ "$(echo ${1##*.})" == "gz" ]; then + tar -x -f $1 + elif [ "$(echo ${1##*.})" == "zip" ]; then + unzip -q $1 + else + false # Format d'archive non pris en charge. + fi + # Copie les fichiers sources + sudo cp -a $(cat ../sources/source_dir)/. "$final_path" + # Copie les fichiers additionnels ou modifiés. + if test -e "../sources/ajouts"; then + sudo cp -a ../sources/ajouts/. "$final_path" + fi +} + +POOL_FPM () { # Créer le fichier de configuration du pool php-fpm et le configure. + sed -i "s@__NAMETOCHANGE__@$app@g" ../conf/php-fpm.conf + sed -i "s@__FINALPATH__@$final_path@g" ../conf/php-fpm.conf + finalphpconf=/etc/php5/fpm/pool.d/$app.conf + sudo cp ../conf/php-fpm.conf $finalphpconf + sudo chown root: $finalphpconf + finalphpini=/etc/php5/fpm/conf.d/20-$app.ini + sudo cp ../conf/php-fpm.ini $finalphpini + sudo chown root: $finalphpini + sudo service php5-fpm reload +} + +STORE_MD5_CONFIG () { # Enregistre la somme de contrôle du fichier de config +# $1 = Nom du fichier de conf pour le stockage dans settings.yml +# $2 = Nom complet et chemin du fichier de conf. + sudo yunohost app setting $app $1_file_md5 -v $(sudo md5sum "$2" | cut -d' ' -f1) +} + +CHECK_MD5_CONFIG () { # Créé un backup du fichier de config si il a été modifié. +# $1 = Nom du fichier de conf pour le stockage dans settings.yml +# $2 = Nom complet et chemin du fichier de conf. + if [ "$(sudo yunohost app setting $app $1_file_md5)" != $(sudo md5sum "$2" | cut -d' ' -f1) ]; then + sudo cp -a "$2" "$2.backup.$(date '+%d.%m.%y_%Hh%M,%Ss')" # Si le fichier de config a été modifié, créer un backup. + fi +} + +FIND_PORT () { # Cherche un port libre. +# $1 = Numéro de port pour débuter la recherche. + port=$1 + while ! sudo yunohost app checkport $port ; do + port=$((port+1)) + done + CHECK_VAR "$port" "port empty" +} + + +### REMOVE SCRIPT + +REMOVE_NGINX_CONF () { # Suppression de la configuration nginx + if [ -e "/etc/nginx/conf.d/$domain.d/$app.conf" ]; then # Delete nginx config + echo "Delete nginx config" + sudo rm "/etc/nginx/conf.d/$domain.d/$app.conf" + sudo service nginx reload + fi +} + +REMOVE_FPM_CONF () { # Suppression de la configuration du pool php-fpm + if [ -e "/etc/php5/fpm/pool.d/$app.conf" ]; then # Delete fpm config + echo "Delete fpm config" + sudo rm "/etc/php5/fpm/pool.d/$app.conf" + fi + if [ -e "/etc/php5/fpm/conf.d/20-$app.ini" ]; then # Delete php config + echo "Delete php config" + sudo rm "/etc/php5/fpm/conf.d/20-$app.ini" + fi + sudo service php5-fpm reload +} + +REMOVE_LOGROTATE_CONF () { # Suppression de la configuration de logrotate + if [ -e "/etc/logrotate.d/$app" ]; then + echo "Delete logrotate config" + sudo rm "/etc/logrotate.d/$app" + fi +} + +REMOVE_APP_DIR () { # Suppression du dossier de l'application + if test -n "$app" + then # Supprime le dossier seulement si $app n'est pas vide. + if [ -e "/var/www/$app" ]; then # Delete final_path + echo "Delete app dir" + sudo rm -r "/var/www/$app" + fi + fi +} + +REMOVE_BDD () { # Suppression de la base de donnée et de l'utilisateur associé. +# $1 = Nom de la base de donnée + # Utilise '$app' comme nom d'utilisateur et de base de donnée + db_user=$1 + if mysqlshow -u root -p$(sudo cat $MYSQL_ROOT_PWD_FILE) | grep -q "^| $db_user"; then + echo "Delete db" + ynh_mysql_drop_db $db_user + ynh_mysql_drop_user $db_user + fi +} \ No newline at end of file diff --git a/scripts/install b/scripts/install index ae9b7f0..2c946b3 100644 --- a/scripts/install +++ b/scripts/install @@ -1,36 +1,42 @@ #!/bin/bash -app=$YNH_APP_INSTANCE_NAME +source .fonctions + +CLEAN_SETUP () { + echo "" +} +TRAP_ON -# Retrieve arguments domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN -is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE +is_public=$YNH_APP_ARG_IS_PUBLIC -ynh_app_setting_set "$app" admin "$admin" -ynh_app_setting_set "$app" is_public "$is_public" -ynh_app_setting_set "$app" language "$language" +app=$YNH_APP_INSTANCE_NAME -# Check domain/path availability -sudo yunohost app checkurl "${domain}${path}" -a "$app" \ -|| ynh_die "Path not available: ${domain}${path}" +# Source app helpers +source /usr/share/yunohost/helpers -# Generate random DES key & password -db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') +CHECK_VAR "$app" "app name not set" -# Use 'spip' as database name and user -db_user=spip +CHECK_USER "$admin" -# Initialize database and store mysql password for upgrade -sudo yunohost app initdb $db_user -p $db_pwd -sudo yunohost app setting spip mysqlpwd -v $db_pwd +CHECK_PATH -# Download and extract files to the right place -final_path=/var/www -wget http://files.spip.org/spip/stable/spip-3.1.zip -unzip spip-3.1.zip -d $final_path +CHECK_DOMAINPATH + +CHECK_FINALPATH + +sudo yunohost app setting $app domain -v $domain +sudo yunohost app setting $app path -v $path +sudo yunohost app setting $app admin -v $admin +sudo yunohost app setting $app is_public -v $is_public +sudo yunohost app setting $app language -v $language + +GENERATE_DB $app # Créer une base de données et un utilisateur dédié au nom de l'app. + +SETUP_SOURCE "spip-3.1.zip" # Set permissions to spip directory sudo chown -R www-data: $final_path @@ -40,14 +46,10 @@ sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sed -i "s@ALIASTOCHANGE@$final_path@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf -sed -i "s@NAMETOCHANGE@spip@g" ../conf/php-fpm.conf -finalphpconf=/etc/php5/fpm/pool.d/spip.conf -sudo cp ../conf/php-fpm.conf $finalphpconf -sudo chown root: $finalphpconf -sudo chmod 644 $finalphpconf +POOL_FPM # Reload Nginx and regenerate SSOwat conf sudo service php5-fpm restart sudo service nginx reload sudo yunohost app setting spip skipped_uris -v "/" -sudo yunohost app ssowatconf +sudo yunohost app ssowatconf \ No newline at end of file diff --git a/scripts/remove b/scripts/remove index 8119be6..f2eb1f8 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,22 +1,23 @@ #!/bin/bash -# See comments in install script -app=$YNH_APP_INSTANCE_NAME +source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script -# Source YunoHost helpers +# Source app helpers source /usr/share/yunohost/helpers -# Retrieve app settings -domain=$(ynh_app_setting_get "$app" domain) +# Récupère les infos de l'application. +app=$YNH_APP_INSTANCE_NAME +domain=$(sudo yunohost app setting $app domain) -db_user=spip -db_name=spip -root_pwd=$(sudo cat /etc/yunohost/mysql) +REMOVE_BDD $app # Suppression de la base de donnée et de l'utilisateur associé. -mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;" -sudo rm -rf /var/www/spip -sudo rm -f /etc/nginx/conf.d/$domain.d/spip.conf -sudo rm -f /etc/php5/fpm/pool.d/spip.conf +REMOVE_APP_DIR # Suppression du dossier de l'application -sudo service php5-fpm restart -sudo service nginx reload \ No newline at end of file +REMOVE_NGINX_CONF # Suppression de la configuration nginx + +REMOVE_FPM_CONF # Suppression de la configuration du pool php-fpm + +# Régénère la configuration de SSOwat +sudo yunohost app ssowatconf + +echo -e "\e[0m" # Restore normal color \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index 9f25cd5..2b685e7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,14 +16,19 @@ admin=$(ynh_app_setting_get "$app" admin) is_public=$(ynh_app_setting_get "$app" is_public) language=$(ynh_app_setting_get "$app" language) -# Remove trailing "/" for next commands -path=${path%/} +CHECK_PATH # Vérifie et corrige la syntaxe du path. + +# Check if admin is not null +if [[ "$admin" = "" || "$is_public" = "" || "$language" = "" ]]; then + echo "Unable to upgrade, please contact support" + exit 1 +fi root_pwd=$(sudo cat /etc/yunohost/mysql) -final_path=/var/www/spip +final_path=/var/www/$app -db_name=spip +db_name=$app # Check if admin is not null if [[ "$admin_spip" = "" || "$is_public" = "" || "$language" = "" ]]; then @@ -38,7 +43,7 @@ sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* if [ $is_public = "Yes" ]; then - sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/spip.conf + sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf # grep -q "define('FORCE_SSL_ADMIN', true);" $final_path/wp-config.php # if [[ ! $? -eq 0 ]]; # then @@ -47,16 +52,16 @@ then # sudo sed -i "s@//define('FORCE_SSL_ADMIN@define('FORCE_SSL_ADMIN@g" $final_path/config/connect.php # fi else - sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf + sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf fi # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # See install script ynh_app_setting_set "$app" unprotected_uris "/" - sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/spip.conf + sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf else - sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf + sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf fi # Reload Nginx diff --git a/sources/source_dir b/sources/source_dir new file mode 100644 index 0000000..b93ec7e --- /dev/null +++ b/sources/source_dir @@ -0,0 +1 @@ +spip \ No newline at end of file diff --git a/sources/source_md5 b/sources/source_md5 new file mode 100644 index 0000000..69bd34d --- /dev/null +++ b/sources/source_md5 @@ -0,0 +1 @@ +96a7fef92ebff098e8b5bb8130a86d39 spip-3.1.zip \ No newline at end of file diff --git a/sources/source_url b/sources/source_url new file mode 100644 index 0000000..ffbcf67 --- /dev/null +++ b/sources/source_url @@ -0,0 +1 @@ +http://files.spip.org/spip/stable/spip-3.1.zip \ No newline at end of file From 4be69a5ff9e905d21c22ce3a403f57eb54f67ea8 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 01:54:24 +0200 Subject: [PATCH 04/97] Update README --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 02ede76..190ac30 100644 --- a/README.md +++ b/README.md @@ -2,21 +2,25 @@ ## Spip for YunoHost -Version 1.0.2 (29/08/16) +### Version 1.0.3 (20/10/16) + +- Update script - status test + +### Version 1.0.2 (29/08/16) - Fix Packaging [Source](https://forum.yunohost.org/t/news-about-app-management-and-packaging-in-yunohost-2-4/1379/1) - Update SPIP Version -Version 1.0.1 (04/01/16) +### Version 1.0.1 (04/01/16) - Delete SPIP sources - Fix install script for download and extract SPIP -Version 1.0.0 (28/12/15) +###Version 1.0.0 (28/12/15) - Create script install -### Configuration +## Configuration 1. Start url https://domaine.tld/spip/ecrire 2. Check SQL password /etc/yunohost/apps/spip/settings.yml From d1a4613bc75b4c7e5afdcd2d35d917d262ed57ff Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 02:01:59 +0200 Subject: [PATCH 05/97] Update manifest.json --- manifest.json | 55 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/manifest.json b/manifest.json index a0ab0df..6dbc4ea 100644 --- a/manifest.json +++ b/manifest.json @@ -1,12 +1,13 @@ { - "name": "SPIP", - "packaging_format": 1, + "name": "SPIP for Yunohost", "id": "spip", + "packaging_format": 1, "description": { "en": "SPIP - publishing system for the Internet", "fr": "SPIP - Système de publication pour l’Internet" }, - "license": "GPL-3", + "url": "http://www.spip.net/", + "license": "free", "maintainer": { "name": "cyp", "email": "cyp@rouquin.me", @@ -15,33 +16,59 @@ "requirements": { "yunohost": ">> 2.4.0" }, - "url": "http://www.spip.net/", - "multi_instance": "true", + "multi_instance": true, + "services": [ + "nginx", + "php5-fpm", + "mysql" + ], "arguments": { "install" : [ { "name": "domain", + "type": "domain", "ask": { - "en": "Choose a domain for SPIP" + "en": "Choose a domain name for SPIP", + "fr": "Choisissez un nom de domaine pour SPIP" }, - "example": "domain.org" + "example": "example.com" }, { "name": "path", + "type": "path", "ask": { - "en": "Choose a path for SPIP" + "en": "Choose a path for SPIP", + "fr": "Choisissez un chemin pour SPIP" }, - "example": "/spip", - "default": "/spip" + "example": "/example", + "default": "/example" }, { "name": "admin", - "type": "user", + "type": "user", "ask": { - "en": "Choose the SPIP administrator (must be an existing YunoHost user)", - "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" + "en": "Choose an admin user", + "fr": "Choisissez l’administrateur" }, - "example": "homer" + "example": "johndoe" + }, + { + "name": "is_public", + "type": "boolean", + "ask": { + "en": "Is it a public application?", + "fr": "Est-ce une application publique ?" + }, + "default": true + }, + { + "name": "language", + "ask": { + "en": "Choose the application language", + "fr": "Choisissez la langue de l'application" + }, + "choices": ["fr", "en"], + "default": "fr" } ] } From 0f2cd40fa8e94547b6af5f67f21566f54650df14 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 15:11:38 +0200 Subject: [PATCH 06/97] Fix is_public choice --- manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 6dbc4ea..b324346 100644 --- a/manifest.json +++ b/manifest.json @@ -54,12 +54,12 @@ }, { "name": "is_public", - "type": "boolean", "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" + "en": "Is it a public WordPress site ?", + "fr": "Est-ce un site public ?" }, - "default": true + "choices": ["Yes", "No"], + "default": "Yes" }, { "name": "language", From fd86b5994e33f9766ef5ae09787f54ea379af4cf Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 15:25:39 +0200 Subject: [PATCH 07/97] Oups --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index b324346..e0da1c1 100644 --- a/manifest.json +++ b/manifest.json @@ -55,7 +55,7 @@ { "name": "is_public", "ask": { - "en": "Is it a public WordPress site ?", + "en": "Is it a public SPIP site ?", "fr": "Est-ce un site public ?" }, "choices": ["Yes", "No"], From 04837cc9fe3ab9f7ca3824da47b32d98f0f4745d Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 15:29:04 +0200 Subject: [PATCH 08/97] Rename php-fpm conf --- conf/{php-fpm.conf => php-fpm.ini} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conf/{php-fpm.conf => php-fpm.ini} (100%) diff --git a/conf/php-fpm.conf b/conf/php-fpm.ini similarity index 100% rename from conf/php-fpm.conf rename to conf/php-fpm.ini From d78f52c8fb561c53f26a6f37f317dc83c6b2511c Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 15:38:53 +0200 Subject: [PATCH 09/97] Fix function POOL_FPM + add php-fpm.conf --- conf/php-fpm.conf | 392 ++++++++++++++++++++++++++++++++++++++++++++++ conf/php-fpm.ini | 246 +---------------------------- 2 files changed, 395 insertions(+), 243 deletions(-) create mode 100644 conf/php-fpm.conf diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf new file mode 100644 index 0000000..5672f10 --- /dev/null +++ b/conf/php-fpm.conf @@ -0,0 +1,392 @@ +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[__NAMETOCHANGE__] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = www-data +group = www-data + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = /var/run/php5-fpm-__NAMETOCHANGE__.sock + +; Set listen(2) backlog. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 128 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0660 +listen.owner = www-data +listen.group = www-data +;listen.mode = 0660 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; priority = -19 + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 10 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 2 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 1 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 3 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: ${prefix}/share/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: ouput header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +slowlog = /var/log/nginx/__NAMETOCHANGE__.slow.log + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +request_slowlog_timeout = 5s + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +request_terminate_timeout = 1d + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +chdir = __FINALPATH__ + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; exectute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M \ No newline at end of file diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini index affcbe5..55e2ba7 100644 --- a/conf/php-fpm.ini +++ b/conf/php-fpm.ini @@ -1,243 +1,3 @@ -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[NAMETOCHANGE] - -; Per pool prefix -; It only applies on the following directives: -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php5-fpm-NAMETOCHANGE.sock - -; Set listen(2) backlog. A value of '-1' means unlimited. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = -1 - -; List of ipv4 addresses of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0666 -listen.owner = www-data -listen.group = www-data -listen.mode = 0600 - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives: -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes to be created when pm is set to 'dynamic'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. -; Note: Used when pm is set to either 'static' or 'dynamic' -; Note: This value is mandatory. -pm.max_children = 6 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 3 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 3 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 5 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. By default, the status page shows the following -; information: -; accepted conn - the number of request accepted by the pool; -; pool - the name of the pool; -; process manager - static or dynamic; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes. -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic') -; The values of 'idle processes', 'active processes' and 'total processes' are -; updated each second. The value of 'accepted conn' is updated in real time. -; Example output: -; accepted conn: 12073 -; pool: www -; process manager: static -; idle processes: 35 -; active processes: 65 -; total processes: 100 -; max children reached: 1 -; By default the status page output is formatted as text/plain. Passing either -; 'html' or 'json' as a query string will return the corresponding output -; syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -pm.status_path = /fpm-status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 120s - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_slowlog_timeout = 5s - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/NAMETOCHANGE.slow.log - -; Set open file descriptor rlimit. -; Default Value: system defined value -rlimit_files = 4096 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = /var/www/NAMETOCHANGE - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -php_value[upload_max_filesize] = 10G -php_value[post_max_size] = 10G -php_value[mail.add_x_header] = Off \ No newline at end of file +upload_max_filesize=30M +post_max_size=30M +; max_execution_time=60 \ No newline at end of file From 991293c62781602e53b1677ed44752149a0c3cd8 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 15:48:43 +0200 Subject: [PATCH 10/97] =?UTF-8?q?Cr=C3=A9e=20le=20repertoire=20de=20destin?= =?UTF-8?q?ation=20et=20stocke=20son=20emplacement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 2c946b3..b28bd68 100644 --- a/scripts/install +++ b/scripts/install @@ -36,6 +36,10 @@ sudo yunohost app setting $app language -v $language GENERATE_DB $app # Créer une base de données et un utilisateur dédié au nom de l'app. +# Crée le repertoire de destination et stocke son emplacement. +sudo mkdir "$final_path" +sudo yunohost app setting $app final_path -v $final_path + SETUP_SOURCE "spip-3.1.zip" # Set permissions to spip directory From 36c04267a086c963391d0a2168a75be3959233e8 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 20 Sep 2016 15:55:49 +0200 Subject: [PATCH 11/97] Change name into manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index e0da1c1..05f74eb 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "SPIP for Yunohost", + "name": "SPIP", "id": "spip", "packaging_format": 1, "description": { From 881db0429d091c4bbb134532cd5d527d98446e54 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 03:37:56 +0100 Subject: [PATCH 12/97] Ajout fichier LICENSE et check_process --- LICENSE | 675 ++++++++++++++++++++++++++++++++++++++++++++++++++ check_process | 39 +++ 2 files changed, 714 insertions(+) create mode 100644 LICENSE create mode 100644 check_process diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..10926e8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/check_process b/check_process new file mode 100644 index 0000000..b4851ac --- /dev/null +++ b/check_process @@ -0,0 +1,39 @@ +;; spip + auto_remove=1 +# Commentaire ignoré + ; Manifest + domain="$DOMAIN" (DOMAIN) + path="$PATH" (PATH) + admin="$USER" (USER) + language="fr" + is_public=1 (PUBLIC|public=1|private=0) + password="$PASSWORD" (PASSWORD) + port="666" (PORT) + ; Checks + pkg_linter=1 + setup_sub_dir=1 + setup_root=1 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=1 + multi_instance=1 + wrong_user=1 + wrong_path=1 + incorrect_path=1 + corrupt_source=0 + fail_download_source=0 + port_already_use=1 (XXXX) + final_path_already_use=0 +;;; Levels + Level 1=auto + Level 2=auto + Level 3=auto + Level 4=0 + Level 5=auto + Level 6=auto + Level 7=auto + Level 8=0 + Level 9=0 + Level 10=0 From b5456e7632bb393bae7e41b775b45bb4d25757f8 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 03:46:24 +0100 Subject: [PATCH 13/97] Ajout du fichier restore et backup --- scripts/backup | 29 ++++++++++++++++++++++++ scripts/restore | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 scripts/backup create mode 100644 scripts/restore diff --git a/scripts/backup b/scripts/backup new file mode 100644 index 0000000..c2b8361 --- /dev/null +++ b/scripts/backup @@ -0,0 +1,29 @@ +#!/bin/bash + +# The parameter $1 is the backup directory location dedicated to the app +backup_dir=$1 + +# The parameter $2 is theid of the app instance +app=$2 + +# Source app helpers +source /usr/share/yunohost/helpers + +domain=$(ynh_app_setting_get $app domain) +final_path=$(ynh_app_setting_get $app final_path) + +# Copy the app files +sudo mkdir -p ${backup_dir}/var/www +sudo cp -a $final_path "${backup_dir}/var/www/$app" + +# Copy the conf files +sudo mkdir -p "${backup_dir}/conf" +sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf "${backup_dir}/conf/nginx.conf" + +# Copy dedicated php-fpm process to backup folder +sudo cp -a /etc/php5/fpm/pool.d/$app.conf "${backup_dir}/conf/php-fpm.conf" +sudo cp -a /etc/php5/fpm/conf.d/20-$app.ini "${backup_dir}/conf/php-fpm.ini" + +# Backup db +root_pwd=$(sudo cat /etc/yunohost/mysql) +sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ${backup_dir}/db.sql" diff --git a/scripts/restore b/scripts/restore new file mode 100644 index 0000000..c08116e --- /dev/null +++ b/scripts/restore @@ -0,0 +1,60 @@ +#!/bin/bash +# This restore script is adapted to Yunohost >=2.4 + +# The parameter $1 is the backup directory location dedicated to the app +backup_dir=$1 + +# The parameter $2 is the id of the app instance ex: ynhexample__2 +app=$2 + +# Source app helpers +source /usr/share/yunohost/helpers + +# Get old parameter of the app +domain=$(ynh_app_setting_get $app domain) +path=$(ynh_app_setting_get $app path) +is_public=$(ynh_app_setting_get $app is_public) +final_path=$(ynh_app_setting_get $app final_path) + +if [ -d $final_path ]; then + ynh_die "There is already a directory: $final_path" +fi + +conf=/etc/nginx/conf.d/$domain.d/$app.conf +if [ -f $conf ]; then + ynh_die "There is already a nginx conf file at this path: $conf" +fi +# Restore conf files +sudo cp -a "${backup_dir}/conf/nginx.conf" $conf + +# Reload Nginx +sudo service nginx reload + +sudo cp -a "${backup_dir}/var/www/$app" $final_path + +db_pwd=$(ynh_app_setting_get $app mysqlpwd) +db_user=$app +ynh_mysql_create_db $db_user $db_user $db_pwd +sudo su -c "mysql -u $db_user -p$db_pwd $app < ${backup_dir}/db.sql" +sudo rm -f "${backup_dir}/db.sql" +sudo sed -i -e "s/'DB_USER', *'[^']*'/'DB_USER', '$app'/g" $final_path/wp-config.php +sudo sed -i -e "s/'DB_NAME', *'[^']*'/'DB_NAME', '$app'/g" $final_path/wp-config.php + +# Set permissions +# Les fichiers appartiennent à www-data, pour permettre les mises à jour. +sudo chown -R www-data: $final_path +# Sauf le fichier de config wp-config.php qui appartient à root +sudo chown root: $final_path/wp-config.php + +# Copy dedicated php-fpm process from backup folder to the right location +sudo cp -a $backup_dir/conf/php-fpm.conf /etc/php5/fpm/pool.d/$app.conf +sudo cp -a $backup_dir/conf/php-fpm.ini /etc/php5/fpm/conf.d/20-$app.ini +# And restart service +sudo service php5-fpm reload + +# Set ssowat config +if [ "$is_public" = "No" ]; +then + ynh_app_setting_delete $app skipped_uris +fi +sudo yunohost app ssowatconf From 5215fb4dedb7c766d8b7bb5c207c59213573b81e Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 04:02:03 +0100 Subject: [PATCH 14/97] =?UTF-8?q?Correction=20qualit=C3=A9=20check=5Fproce?= =?UTF-8?q?ss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- check_process | 49 ++++++++++++++++++++++++++++++++++------------ scripts/.fonctions | 4 ++-- scripts/backup | 3 +++ scripts/install | 36 ++++++++++++++++++++++------------ scripts/remove | 2 +- scripts/upgrade | 5 ++--- 6 files changed, 68 insertions(+), 31 deletions(-) diff --git a/check_process b/check_process index b4851ac..359db85 100644 --- a/check_process +++ b/check_process @@ -1,14 +1,12 @@ -;; spip +;; Test complet sans multisite auto_remove=1 -# Commentaire ignoré ; Manifest - domain="$DOMAIN" (DOMAIN) - path="$PATH" (PATH) - admin="$USER" (USER) - language="fr" - is_public=1 (PUBLIC|public=1|private=0) - password="$PASSWORD" (PASSWORD) - port="666" (PORT) + domain="domain.tld" (DOMAIN) + path="/path" (PATH) + admin="john" (USER) + language="fr_FR" + multisite="No" + is_public="Yes" (PUBLIC|public=Yes|private=No) ; Checks pkg_linter=1 setup_sub_dir=1 @@ -24,16 +22,41 @@ incorrect_path=1 corrupt_source=0 fail_download_source=0 - port_already_use=1 (XXXX) + port_already_use=0 + final_path_already_use=0 +;; Test avec multisite + auto_remove=1 + ; Manifest + domain="domain.tld" (DOMAIN) + path="/path" (PATH) + admin="john" (USER) + language="fr_FR" + multisite="Yes" + is_public="Yes" (PUBLIC|public=Yes|private=No) + ; Checks + setup_sub_dir=1 + setup_root=0 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=1 + multi_instance=1 + 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 Level 3=auto - Level 4=0 - Level 5=auto + Level 4=1 + Level 5=1 Level 6=auto Level 7=auto Level 8=0 Level 9=0 - Level 10=0 + Level 10=0 \ No newline at end of file diff --git a/scripts/.fonctions b/scripts/.fonctions index 9d3e018..6e38d1b 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -75,8 +75,8 @@ GENERATE_DB () { # Créer une base de données et un utilisateur dédié au nom CHECK_VAR "$db_pwd" "db_pwd empty" # Utilise '$app' comme nom d'utilisateur et de base de donnée # Initialise la base de donnée et stocke le mot de passe mysql. - ynh_mysql_create_db $db_user $db_user $db_pwd - sudo yunohost app setting $app mysqlpwd -v $db_pwd + ynh_mysql_create_db "$db_user" "$db_user" $db_pwd + ynh_app_setting_set $app mysqlpwd $db_pwd } SETUP_SOURCE () { # Télécharge la source, décompresse et copie dans $final_path diff --git a/scripts/backup b/scripts/backup index c2b8361..58a7016 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,5 +1,8 @@ #!/bin/bash +# Exit on command errors and treat unset variables as an error +set -eu + # The parameter $1 is the backup directory location dedicated to the app backup_dir=$1 diff --git a/scripts/install b/scripts/install index b28bd68..28c8398 100644 --- a/scripts/install +++ b/scripts/install @@ -1,16 +1,19 @@ #!/bin/bash -source .fonctions +source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script CLEAN_SETUP () { - echo "" +# Nettoyage des résidus d'installation non pris en charge par le script remove. + # Clean hosts + sudo sed -i '/#SPIP/d' /etc/hosts } -TRAP_ON +TRAP_ON # Active trap pour arrêter le script si une erreur est détectée. domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH -admin=$YNH_APP_ARG_ADMIN +admin_wordpress=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE +multisite=$YNH_APP_ARG_MULTISITE is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME @@ -28,17 +31,18 @@ CHECK_DOMAINPATH CHECK_FINALPATH -sudo yunohost app setting $app domain -v $domain -sudo yunohost app setting $app path -v $path -sudo yunohost app setting $app admin -v $admin -sudo yunohost app setting $app is_public -v $is_public -sudo yunohost app setting $app language -v $language +ynh_app_setting_set $app domain $domain +ynh_app_setting_set $app path $path +ynh_app_setting_set $app admin $admin_spip +ynh_app_setting_set $app is_public $is_public +ynh_app_setting_set $app language $language +ynh_app_setting_set $app multisite $multisite GENERATE_DB $app # Créer une base de données et un utilisateur dédié au nom de l'app. # Crée le repertoire de destination et stocke son emplacement. sudo mkdir "$final_path" -sudo yunohost app setting $app final_path -v $final_path +ynh_app_setting_set $app final_path -v $final_path SETUP_SOURCE "spip-3.1.zip" @@ -55,5 +59,13 @@ POOL_FPM # Reload Nginx and regenerate SSOwat conf sudo service php5-fpm restart sudo service nginx reload -sudo yunohost app setting spip skipped_uris -v "/" -sudo yunohost app ssowatconf \ No newline at end of file + +if [ "$is_public" = "No" ]; +then + # Retire l'accès public + ynh_app_setting_delete $app unprotected_uris + sudo yunohost app ssowatconf +fi + +# Nettoyer hosts +sudo sed -i '/#SPIP/d' /etc/hosts \ No newline at end of file diff --git a/scripts/remove b/scripts/remove index f2eb1f8..1a26f82 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,7 @@ source /usr/share/yunohost/helpers # Récupère les infos de l'application. app=$YNH_APP_INSTANCE_NAME -domain=$(sudo yunohost app setting $app domain) +domain=$(ynh_app_setting_set $app domain) REMOVE_BDD $app # Suppression de la base de donnée et de l'utilisateur associé. diff --git a/scripts/upgrade b/scripts/upgrade index 2b685e7..22f70ae 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ CHECK_PATH # Vérifie et corrige la syntaxe du path. # Check if admin is not null if [[ "$admin" = "" || "$is_public" = "" || "$language" = "" ]]; then echo "Unable to upgrade, please contact support" - exit 1 + ynh_die fi root_pwd=$(sudo cat /etc/yunohost/mysql) @@ -33,10 +33,9 @@ db_name=$app # Check if admin is not null if [[ "$admin_spip" = "" || "$is_public" = "" || "$language" = "" ]]; then echo "Unable to upgrade, please contact support" - exit 1 + ynh_die fi - # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf* sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* From bc3aec5a08b5936fd556752e0fc546679d1eb6cc Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 04:04:26 +0100 Subject: [PATCH 15/97] =?UTF-8?q?Correction=20qualit=C3=A9=20check=5Fproce?= =?UTF-8?q?ss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 3 +++ scripts/remove | 3 +++ 2 files changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index 28c8398..fbb08fb 100644 --- a/scripts/install +++ b/scripts/install @@ -1,5 +1,8 @@ #!/bin/bash +# Exit on command errors and treat unset variables as an error +set -eu + source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script CLEAN_SETUP () { diff --git a/scripts/remove b/scripts/remove index 1a26f82..49266a2 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,5 +1,8 @@ #!/bin/bash +# Exit on command errors and treat unset variables as an error +set -eu + source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script # Source app helpers From 1722810bc65a7c1783e001654dd06d9e04b8909f Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 04:07:01 +0100 Subject: [PATCH 16/97] =?UTF-8?q?Correction=20qualit=C3=A9=20check=5Fproce?= =?UTF-8?q?ss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/.fonctions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 6e38d1b..76df5ac 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -26,7 +26,7 @@ EXIT_PROPERLY () { # Provoque l'arrêt du script en cas d'erreur. Et nettoye les /bin/bash $script_dir/remove # Appel le script remove. En 2.2, ce comportement n'est pas automatique. fi - exit 1 + ynh_die } TRAP_ON () { # Activate signal capture @@ -115,13 +115,13 @@ POOL_FPM () { # Créer le fichier de configuration du pool php-fpm et le configu STORE_MD5_CONFIG () { # Enregistre la somme de contrôle du fichier de config # $1 = Nom du fichier de conf pour le stockage dans settings.yml # $2 = Nom complet et chemin du fichier de conf. - sudo yunohost app setting $app $1_file_md5 -v $(sudo md5sum "$2" | cut -d' ' -f1) + ynh_app_setting_set $app $1_file_md5 -v $(sudo md5sum "$2" | cut -d' ' -f1) } CHECK_MD5_CONFIG () { # Créé un backup du fichier de config si il a été modifié. # $1 = Nom du fichier de conf pour le stockage dans settings.yml # $2 = Nom complet et chemin du fichier de conf. - if [ "$(sudo yunohost app setting $app $1_file_md5)" != $(sudo md5sum "$2" | cut -d' ' -f1) ]; then + if [ "$(ynh_app_setting_set $app $1_file_md5)" != $(sudo md5sum "$2" | cut -d' ' -f1) ]; then sudo cp -a "$2" "$2.backup.$(date '+%d.%m.%y_%Hh%M,%Ss')" # Si le fichier de config a été modifié, créer un backup. fi } From a6a9fe30e47e1cc9e329946fcabc85a0c70f5252 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 04:23:47 +0100 Subject: [PATCH 17/97] =?UTF-8?q?Correction=20qualit=C3=A9=20check=5Fproce?= =?UTF-8?q?ss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/remove | 2 +- scripts/restore | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 49266a2..9e18667 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,7 +1,7 @@ #!/bin/bash # Exit on command errors and treat unset variables as an error -set -eu +set -u source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script diff --git a/scripts/restore b/scripts/restore index c08116e..972a016 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,9 @@ #!/bin/bash # This restore script is adapted to Yunohost >=2.4 +# Exit on command errors and treat unset variables as an error +set -eu + # The parameter $1 is the backup directory location dedicated to the app backup_dir=$1 From 00cad842f28004d57d20d12198b3e528c568a0f8 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 04:52:10 +0100 Subject: [PATCH 18/97] Mieux traiter la suppression de l'app --- scripts/.fonctions | 30 ++++++++++++++++++++++++------ scripts/remove | 1 + 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 76df5ac..22a8e0b 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -165,13 +165,31 @@ REMOVE_LOGROTATE_CONF () { # Suppression de la configuration de logrotate fi } -REMOVE_APP_DIR () { # Suppression du dossier de l'application - if test -n "$app" - then # Supprime le dossier seulement si $app n'est pas vide. - if [ -e "/var/www/$app" ]; then # Delete final_path - echo "Delete app dir" - sudo rm -r "/var/www/$app" +SECURE_REMOVE () { # Suppression de dossier avec vérification des variables + chaine="$1" # L'argument doit être donné entre quotes simple '', pour éviter d'interpréter les variables. + no_var=0 + while (echo "$chaine" | grep -q '\$') # Boucle tant qu'il y a des $ dans la chaine + do + no_var=1 + global_var=$(echo "$chaine" | cut -d '$' -f 2) # Isole la première variable trouvée. + only_var=\$$(expr "$global_var" : '\([A-Za-z0-9_]*\)') # Isole complètement la variable en ajoutant le $ au début et en gardant uniquement le nom de la variable. Se débarrasse surtout du / et d'un éventuel chemin derrière. + real_var=$(eval "echo ${only_var}") # `eval "echo ${var}` permet d'interpréter une variable contenue dans une variable. + if test -z "$real_var" || [ "$real_var" = "/" ]; then + echo "Variable $only_var is empty, suppression of $chaine cancelled." >&2 + return 1 fi + chaine=$(echo "$chaine" | sed "s@$only_var@$real_var@") # remplace la variable par sa valeur dans la chaine. + done + if [ "$no_var" -eq 1 ] + then + if [ -e "$chaine" ]; then + echo "Delete directory $chaine" + sudo rm -r "$chaine" + fi + return 0 + else + echo "No detected variable." >&2 + return 1 fi } diff --git a/scripts/remove b/scripts/remove index 9e18667..3ed2b1b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -15,6 +15,7 @@ domain=$(ynh_app_setting_set $app domain) REMOVE_BDD $app # Suppression de la base de donnée et de l'utilisateur associé. REMOVE_APP_DIR # Suppression du dossier de l'application +SECURE_REMOVE '/var/www/$app' # Suppression du dossier de l'application REMOVE_NGINX_CONF # Suppression de la configuration nginx From e964931aaeeeb0dbd319e63415ca19bf7a574019 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 04:59:01 +0100 Subject: [PATCH 19/97] Suppression code doublon --- scripts/upgrade | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 22f70ae..d20113b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,12 +30,6 @@ final_path=/var/www/$app db_name=$app -# Check if admin is not null -if [[ "$admin_spip" = "" || "$is_public" = "" || "$language" = "" ]]; then - echo "Unable to upgrade, please contact support" - ynh_die -fi - # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf* sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* From 1bbaef34c20ff197339e0ca1b1b0d4a6c4cb6d9b Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 15:29:47 +0100 Subject: [PATCH 20/97] Correction coquille --- scripts/install | 6 +++--- scripts/remove | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index fbb08fb..794a526 100644 --- a/scripts/install +++ b/scripts/install @@ -14,9 +14,9 @@ TRAP_ON # Active trap pour arrêter le script si une erreur est détectée. domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH -admin_wordpress=$YNH_APP_ARG_ADMIN +admin_spip=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE -multisite=$YNH_APP_ARG_MULTISITE +#multisite=$YNH_APP_ARG_MULTISITE is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME @@ -39,7 +39,7 @@ ynh_app_setting_set $app path $path ynh_app_setting_set $app admin $admin_spip ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app language $language -ynh_app_setting_set $app multisite $multisite +#ynh_app_setting_set $app multisite $multisite GENERATE_DB $app # Créer une base de données et un utilisateur dédié au nom de l'app. diff --git a/scripts/remove b/scripts/remove index 3ed2b1b..5177456 100644 --- a/scripts/remove +++ b/scripts/remove @@ -14,7 +14,6 @@ domain=$(ynh_app_setting_set $app domain) REMOVE_BDD $app # Suppression de la base de donnée et de l'utilisateur associé. -REMOVE_APP_DIR # Suppression du dossier de l'application SECURE_REMOVE '/var/www/$app' # Suppression du dossier de l'application REMOVE_NGINX_CONF # Suppression de la configuration nginx From cbe7fa03540fdccca227caf25213081d1074cd04 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 15:31:28 +0100 Subject: [PATCH 21/97] Correction coquille --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 794a526..8a25871 100644 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ source /usr/share/yunohost/helpers CHECK_VAR "$app" "app name not set" -CHECK_USER "$admin" +CHECK_USER "$admin_spip" CHECK_PATH From b9b5aa0a12f2a375d5b5354e551839810132424a Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 15:34:35 +0100 Subject: [PATCH 22/97] Correction coquille --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8a25871..fb6a549 100644 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,7 @@ GENERATE_DB $app # Créer une base de données et un utilisateur dédié au nom # Crée le repertoire de destination et stocke son emplacement. sudo mkdir "$final_path" -ynh_app_setting_set $app final_path -v $final_path +ynh_app_setting_set $app final_path $final_path SETUP_SOURCE "spip-3.1.zip" From fdc03b4f0162b5d732b34c4b04a2d6b9dd525ea6 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 15:39:21 +0100 Subject: [PATCH 23/97] Correction coquille --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index fb6a549..0303913 100644 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,7 @@ TRAP_ON # Active trap pour arrêter le script si une erreur est détectée. domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH -admin_spip=$YNH_APP_ARG_ADMIN +admin=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE #multisite=$YNH_APP_ARG_MULTISITE is_public=$YNH_APP_ARG_IS_PUBLIC @@ -26,7 +26,7 @@ source /usr/share/yunohost/helpers CHECK_VAR "$app" "app name not set" -CHECK_USER "$admin_spip" +CHECK_USER "$admin" CHECK_PATH @@ -36,7 +36,7 @@ CHECK_FINALPATH ynh_app_setting_set $app domain $domain ynh_app_setting_set $app path $path -ynh_app_setting_set $app admin $admin_spip +ynh_app_setting_set $app admin $admin ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app language $language #ynh_app_setting_set $app multisite $multisite From 11341ae97c00963996fa1b64a2a90f9d63abbb35 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 16:29:38 +0100 Subject: [PATCH 24/97] Corrige la fonction CHECK_USER --- scripts/.fonctions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 22a8e0b..9ce8c13 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -42,7 +42,7 @@ TRAP_OFF () { # Ignoring signal capture until TRAP_ON CHECK_USER () { # Vérifie la validité de l'user admin # $1 = Variable de l'user admin. - sudo yunohost user list --json | grep -q "\"username\": \"$1\"" || (echo "Wrong admin" >&2 && false) + ynh_user_exists "$1" || (echo "Wrong admin" >&2 && false) } CHECK_PATH () { # Vérifie la présence du / en début de path. Et son absence à la fin. From e050e3084d57792c098cc22eb723fcbb4e5cfb96 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 16:53:54 +0100 Subject: [PATCH 25/97] ISO langue manifest --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 05f74eb..dad3e8e 100644 --- a/manifest.json +++ b/manifest.json @@ -67,8 +67,8 @@ "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["fr", "en"], - "default": "fr" + "choices": ["en_EN", "fr_FR"], + "default": "fr_FR" } ] } From 33594d7950a7b361d3170b96032686fa18f05438 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 16:54:39 +0100 Subject: [PATCH 26/97] admin en admin_spip --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 0303913..fb6a549 100644 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,7 @@ TRAP_ON # Active trap pour arrêter le script si une erreur est détectée. domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH -admin=$YNH_APP_ARG_ADMIN +admin_spip=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE #multisite=$YNH_APP_ARG_MULTISITE is_public=$YNH_APP_ARG_IS_PUBLIC @@ -26,7 +26,7 @@ source /usr/share/yunohost/helpers CHECK_VAR "$app" "app name not set" -CHECK_USER "$admin" +CHECK_USER "$admin_spip" CHECK_PATH @@ -36,7 +36,7 @@ CHECK_FINALPATH ynh_app_setting_set $app domain $domain ynh_app_setting_set $app path $path -ynh_app_setting_set $app admin $admin +ynh_app_setting_set $app admin $admin_spip ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app language $language #ynh_app_setting_set $app multisite $multisite From ac3448566e18e2ef11b094ff28f659caf4624958 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 17:06:33 +0100 Subject: [PATCH 27/97] [test] ne pas check le user --- scripts/.fonctions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 9ce8c13..7a57870 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -42,7 +42,7 @@ TRAP_OFF () { # Ignoring signal capture until TRAP_ON CHECK_USER () { # Vérifie la validité de l'user admin # $1 = Variable de l'user admin. - ynh_user_exists "$1" || (echo "Wrong admin" >&2 && false) + # ynh_user_exists "$1" || (echo "Wrong admin" >&2 && false) } CHECK_PATH () { # Vérifie la présence du / en début de path. Et son absence à la fin. From 0a4d20e6bd9ecf270f4d99e6058aa4e5b925eb5e Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 17:07:30 +0100 Subject: [PATCH 28/97] [test] ne pas check le user --- scripts/.fonctions | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 7a57870..9ce8c13 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -42,7 +42,7 @@ TRAP_OFF () { # Ignoring signal capture until TRAP_ON CHECK_USER () { # Vérifie la validité de l'user admin # $1 = Variable de l'user admin. - # ynh_user_exists "$1" || (echo "Wrong admin" >&2 && false) + ynh_user_exists "$1" || (echo "Wrong admin" >&2 && false) } CHECK_PATH () { # Vérifie la présence du / en début de path. Et son absence à la fin. diff --git a/scripts/install b/scripts/install index fb6a549..9010554 100644 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ source /usr/share/yunohost/helpers CHECK_VAR "$app" "app name not set" -CHECK_USER "$admin_spip" +# CHECK_USER "$admin_spip" CHECK_PATH From e2d1a9d8e6a6e14d9efa73ab07197954eee7c917 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 17:10:31 +0100 Subject: [PATCH 29/97] Fix une erreur avec la fonction ynh_app_setting_set --- scripts/.fonctions | 4 ++-- scripts/install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 9ce8c13..14ec502 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -115,13 +115,13 @@ POOL_FPM () { # Créer le fichier de configuration du pool php-fpm et le configu STORE_MD5_CONFIG () { # Enregistre la somme de contrôle du fichier de config # $1 = Nom du fichier de conf pour le stockage dans settings.yml # $2 = Nom complet et chemin du fichier de conf. - ynh_app_setting_set $app $1_file_md5 -v $(sudo md5sum "$2" | cut -d' ' -f1) + ynh_app_setting_set $app $1_file_md5 $(sudo md5sum "$2" | cut -d' ' -f1) } CHECK_MD5_CONFIG () { # Créé un backup du fichier de config si il a été modifié. # $1 = Nom du fichier de conf pour le stockage dans settings.yml # $2 = Nom complet et chemin du fichier de conf. - if [ "$(ynh_app_setting_set $app $1_file_md5)" != $(sudo md5sum "$2" | cut -d' ' -f1) ]; then + if [ "$(ynh_app_setting_get $app $1_file_md5)" != $(sudo md5sum "$2" | cut -d' ' -f1) ]; then sudo cp -a "$2" "$2.backup.$(date '+%d.%m.%y_%Hh%M,%Ss')" # Si le fichier de config a été modifié, créer un backup. fi } diff --git a/scripts/install b/scripts/install index 9010554..fb6a549 100644 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ source /usr/share/yunohost/helpers CHECK_VAR "$app" "app name not set" -# CHECK_USER "$admin_spip" +CHECK_USER "$admin_spip" CHECK_PATH From de762e497727d97f327da695aae526d8b075b7d2 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 17:22:15 +0100 Subject: [PATCH 30/97] =?UTF-8?q?Donne=20un=20acc=C3=A8s=20public=20pour?= =?UTF-8?q?=20curl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index fb6a549..cbbea49 100644 --- a/scripts/install +++ b/scripts/install @@ -59,10 +59,16 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf POOL_FPM +# Donne un accès public pour curl +ynh_app_setting_set $app unprotected_uris "/" + # Reload Nginx and regenerate SSOwat conf sudo service php5-fpm restart sudo service nginx reload +# Régénère la configuration de SSOwat +sudo yunohost app ssowatconf + if [ "$is_public" = "No" ]; then # Retire l'accès public From b2e20e1b27571ec8fb324b1739069b4514c3a84d Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 18:00:37 +0100 Subject: [PATCH 31/97] Source SPIP + md5 --- manifest.json | 12 ++++++------ scripts/install | 8 +++++--- sources/source_md5 | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/manifest.json b/manifest.json index dad3e8e..0b58a0f 100644 --- a/manifest.json +++ b/manifest.json @@ -26,26 +26,26 @@ "install" : [ { "name": "domain", - "type": "domain", + "type": "domain", "ask": { "en": "Choose a domain name for SPIP", "fr": "Choisissez un nom de domaine pour SPIP" }, - "example": "example.com" + "example": "example.org" }, { "name": "path", - "type": "path", + "type": "path", "ask": { "en": "Choose a path for SPIP", "fr": "Choisissez un chemin pour SPIP" }, - "example": "/example", - "default": "/example" + "example": "/spip", + "default": "/spip" }, { "name": "admin", - "type": "user", + "type": "user", "ask": { "en": "Choose an admin user", "fr": "Choisissez l’administrateur" diff --git a/scripts/install b/scripts/install index cbbea49..d3df6bb 100644 --- a/scripts/install +++ b/scripts/install @@ -52,6 +52,8 @@ SETUP_SOURCE "spip-3.1.zip" # Set permissions to spip directory sudo chown -R www-data: $final_path +echo -e "127.0.0.1 $domain #SPIP" | sudo tee -a /etc/hosts + # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sed -i "s@ALIASTOCHANGE@$final_path@g" ../conf/nginx.conf @@ -62,13 +64,13 @@ POOL_FPM # Donne un accès public pour curl ynh_app_setting_set $app unprotected_uris "/" +# Régénère la configuration de SSOwat +sudo yunohost app ssowatconf + # Reload Nginx and regenerate SSOwat conf sudo service php5-fpm restart sudo service nginx reload -# Régénère la configuration de SSOwat -sudo yunohost app ssowatconf - if [ "$is_public" = "No" ]; then # Retire l'accès public diff --git a/sources/source_md5 b/sources/source_md5 index 69bd34d..6347c2e 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -96a7fef92ebff098e8b5bb8130a86d39 spip-3.1.zip \ No newline at end of file +61fee69d15b9e3154ad1a3be596cb0fa spip-3.1.zip \ No newline at end of file From 13934c8d12bf95e0d5eecd8fb70a6aa61cf30f4d Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 18:27:57 +0100 Subject: [PATCH 32/97] Modification de la conf nginx --- conf/nginx.conf | 76 ++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 55278a1..b1eca41 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,52 +1,30 @@ -location PATHTOCHANGE { - alias ALIASTOCHANGE; - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php spip.php; - if (!-e $request_filename) { - rewrite ^(.+)$ PATHTOCHANGE/spip.php?page=$1 last; - } - client_max_body_size 30m; - location ~^/(tmp|config)/{ - return 403; - } - location ~* \.(jpg|jpeg|gif|css|png|js|ico|swf|mp3|pdf)$ { - # Le contenu statique, est signalé au navigateur comme étant - # à garder en cache une semaine. Si il y a un proxy sur la - # route, celui-ci est autorisé à faire une copie et à la - # cacher. - expires 1w; - add_header Cache-Control public; - } - location /spip { - # La configuration globale du site. Tout ce qui ne va dans - # aucune autre location vas ici. +#--MULTISITE--if (!-e $request_filename) { + #--MULTISITE--rewrite /wp-admin$ $scheme://$host$uri/ permanent; + #--MULTISITE--rewrite ^__PATHTOCHANGE__(/[^/]+)?(/wp-.*) __PATHTOCHANGE__$2 last; + #--MULTISITE--rewrite ^__PATHTOCHANGE__(/[^/]+)?(/.*\.php)$ __PATHTOCHANGE__$2 last; +#--MULTISITE--} - # Quelques fichiers standards générés par spip et devant être - # à des URL précises. - rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; - rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; - rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; - rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; +location __PATHTOCHANGE__ { + alias __FINALPATH__/; + index index.php; + if (!-e $request_filename) + { + rewrite ^(.+)$ __PATHTOCHANGE__/index.php?q=$1 last; + } + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + client_max_body_size 30m; + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; + } - try_files $uri $uri/ /spip.php?q=$uri&$args; - } - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm-spip.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - - set $ecrire 0; - if ($uri ~ ^/ecrire.*) { - set $ecrire 1; - } - } - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + #--PRIVATE--# Include SSOWAT user panel. + #--PRIVATE--include conf.d/yunohost_panel.conf.inc; } From f7482b54003913b3017d4d1f976678b4c7e087ec Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 21 Feb 2017 18:42:21 +0100 Subject: [PATCH 33/97] Installation de la conf nginx incorrect + debut configuration SPIP BDD --- conf/config.php | 5 +++++ scripts/install | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 conf/config.php diff --git a/conf/config.php b/conf/config.php new file mode 100644 index 0000000..c376802 --- /dev/null +++ b/conf/config.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/scripts/install b/scripts/install index d3df6bb..a9632f2 100644 --- a/scripts/install +++ b/scripts/install @@ -54,13 +54,22 @@ sudo chown -R www-data: $final_path echo -e "127.0.0.1 $domain #SPIP" | sudo tee -a /etc/hosts -# Modify Nginx configuration file and copy it to Nginx conf directory -sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf -sed -i "s@ALIASTOCHANGE@$final_path@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf +# Et copie le fichier de config nginx +sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf + +# Modifie les variables dans le fichier de configuration nginx +sudo sed -i "s@__PATHTOCHANGE__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf +sudo sed -i "s@__FINALPATH__@$final_path@g" /etc/nginx/conf.d/$domain.d/$app.conf +sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf POOL_FPM +sudo cp ../conf/config.php $final_path/config/config.php + +# Changer les variables du ficher de configuration de SPIP +sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/config/config.php +sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/config.php + # Donne un accès public pour curl ynh_app_setting_set $app unprotected_uris "/" From 901a4c59ac35b08a7e8df16b415efd8f024fdc11 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 00:38:20 +0100 Subject: [PATCH 34/97] Nettoyage des coquilles --- conf/{config.php => connect.php} | 0 conf/nginx.conf | 3 +-- scripts/install | 6 +++--- scripts/restore | 8 ++++---- scripts/upgrade | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) rename conf/{config.php => connect.php} (100%) diff --git a/conf/config.php b/conf/connect.php similarity index 100% rename from conf/config.php rename to conf/connect.php diff --git a/conf/nginx.conf b/conf/nginx.conf index b1eca41..2ed3b7d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,5 @@ #--MULTISITE--if (!-e $request_filename) { - #--MULTISITE--rewrite /wp-admin$ $scheme://$host$uri/ permanent; - #--MULTISITE--rewrite ^__PATHTOCHANGE__(/[^/]+)?(/wp-.*) __PATHTOCHANGE__$2 last; + #--MULTISITE--rewrite /ecrire$ $scheme://$host$uri/ permanent; #--MULTISITE--rewrite ^__PATHTOCHANGE__(/[^/]+)?(/.*\.php)$ __PATHTOCHANGE__$2 last; #--MULTISITE--} diff --git a/scripts/install b/scripts/install index a9632f2..63fe196 100644 --- a/scripts/install +++ b/scripts/install @@ -64,11 +64,11 @@ sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf POOL_FPM -sudo cp ../conf/config.php $final_path/config/config.php +sudo cp ../conf/connect.php $final_path/config/connect.php # Changer les variables du ficher de configuration de SPIP -sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/config/config.php -sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/config.php +sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/config/connect.php +sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/connect.php # Donne un accès public pour curl ynh_app_setting_set $app unprotected_uris "/" diff --git a/scripts/restore b/scripts/restore index 972a016..4d225e0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,14 +40,14 @@ db_user=$app ynh_mysql_create_db $db_user $db_user $db_pwd sudo su -c "mysql -u $db_user -p$db_pwd $app < ${backup_dir}/db.sql" sudo rm -f "${backup_dir}/db.sql" -sudo sed -i -e "s/'DB_USER', *'[^']*'/'DB_USER', '$app'/g" $final_path/wp-config.php -sudo sed -i -e "s/'DB_NAME', *'[^']*'/'DB_NAME', '$app'/g" $final_path/wp-config.php +sudo sed -i -e "s/'DB_USER', *'[^']*'/'DB_USER', '$app'/g" $final_path/config/connect.php +sudo sed -i -e "s/'DB_NAME', *'[^']*'/'DB_NAME', '$app'/g" $final_path/config/connect.php # Set permissions # Les fichiers appartiennent à www-data, pour permettre les mises à jour. sudo chown -R www-data: $final_path -# Sauf le fichier de config wp-config.php qui appartient à root -sudo chown root: $final_path/wp-config.php +# Sauf le fichier de config connect.php qui appartient à root +sudo chown root: $final_path/config/connect.php # Copy dedicated php-fpm process from backup folder to the right location sudo cp -a $backup_dir/conf/php-fpm.conf /etc/php5/fpm/pool.d/$app.conf diff --git a/scripts/upgrade b/scripts/upgrade index d20113b..55202b9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,7 +37,7 @@ sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* if [ $is_public = "Yes" ]; then sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf - # grep -q "define('FORCE_SSL_ADMIN', true);" $final_path/wp-config.php + # grep -q "define('FORCE_SSL_ADMIN', true);" $final_path/config/connect.php # if [[ ! $? -eq 0 ]]; # then # echo "define('FORCE_SSL_ADMIN', true);" | sudo tee -a $final_path/config/connect.php From 62b1d2bfb35f203d13d38e14adfc23393ffb2a77 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 00:42:37 +0100 Subject: [PATCH 35/97] Source md5 de SPIP --- sources/source_md5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/source_md5 b/sources/source_md5 index 6347c2e..070d3e9 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -61fee69d15b9e3154ad1a3be596cb0fa spip-3.1.zip \ No newline at end of file +63e6b3ed8c0725b3befdb2867a070e81 spip-3.1.zip \ No newline at end of file From 3aea487f39535f4df4afb6a277abdef76c598d20 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 01:15:59 +0100 Subject: [PATCH 36/97] Installation de la base --- conf/sql/spip.sql | 1084 +++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 8 + 2 files changed, 1092 insertions(+) create mode 100644 conf/sql/spip.sql diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql new file mode 100644 index 0000000..c96ff97 --- /dev/null +++ b/conf/sql/spip.sql @@ -0,0 +1,1084 @@ +-- MySQL dump 10.15 Distrib 10.0.29-MariaDB, for debian-linux-gnueabihf (armv7l) +-- +-- Host: spip Database: spip +-- ------------------------------------------------------ +-- Server version 10.0.29-MariaDB-0+deb8u1 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `spip_articles` +-- + +DROP TABLE IF EXISTS `spip_articles`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_articles` ( + `id_article` bigint(21) NOT NULL AUTO_INCREMENT, + `surtitre` text NOT NULL, + `titre` text NOT NULL, + `soustitre` text NOT NULL, + `id_rubrique` bigint(21) NOT NULL DEFAULT '0', + `descriptif` text NOT NULL, + `chapo` mediumtext NOT NULL, + `texte` longtext NOT NULL, + `ps` mediumtext NOT NULL, + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `statut` varchar(10) NOT NULL DEFAULT '0', + `id_secteur` bigint(21) NOT NULL DEFAULT '0', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `export` varchar(10) DEFAULT 'oui', + `date_redac` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `visites` int(11) NOT NULL DEFAULT '0', + `referers` int(11) NOT NULL DEFAULT '0', + `popularite` double NOT NULL DEFAULT '0', + `accepter_forum` char(3) NOT NULL DEFAULT '', + `date_modif` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `lang` varchar(10) NOT NULL DEFAULT '', + `langue_choisie` varchar(3) DEFAULT 'non', + `id_trad` bigint(21) NOT NULL DEFAULT '0', + `nom_site` tinytext NOT NULL, + `url_site` text NOT NULL, + `virtuel` text NOT NULL, + PRIMARY KEY (`id_article`), + KEY `id_rubrique` (`id_rubrique`), + KEY `id_secteur` (`id_secteur`), + KEY `id_trad` (`id_trad`), + KEY `lang` (`lang`), + KEY `statut` (`statut`,`date`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_articles` +-- + +LOCK TABLES `spip_articles` WRITE; +/*!40000 ALTER TABLE `spip_articles` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_articles` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_auteurs` +-- + +DROP TABLE IF EXISTS `spip_auteurs`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_auteurs` ( + `id_auteur` bigint(21) NOT NULL AUTO_INCREMENT, + `nom` text NOT NULL, + `bio` text NOT NULL, + `email` tinytext NOT NULL, + `nom_site` tinytext NOT NULL, + `url_site` text NOT NULL, + `login` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `pass` tinytext NOT NULL, + `low_sec` tinytext NOT NULL, + `statut` varchar(255) NOT NULL DEFAULT '0', + `webmestre` varchar(3) NOT NULL DEFAULT 'non', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `pgp` text NOT NULL, + `htpass` tinytext NOT NULL, + `en_ligne` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `alea_actuel` tinytext, + `alea_futur` tinytext, + `prefs` tinytext, + `cookie_oubli` tinytext, + `source` varchar(10) NOT NULL DEFAULT 'spip', + `lang` varchar(10) NOT NULL DEFAULT '', + `imessage` varchar(3) DEFAULT NULL, + `messagerie` varchar(3) DEFAULT NULL, + PRIMARY KEY (`id_auteur`), + KEY `login` (`login`), + KEY `statut` (`statut`), + KEY `en_ligne` (`en_ligne`) +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_auteurs` +-- + +LOCK TABLES `spip_auteurs` WRITE; +/*!40000 ALTER TABLE `spip_auteurs` DISABLE KEYS */; +INSERT INTO `spip_auteurs` VALUES (1,'__DB_USER__','','__DB_USER__@__DOMAIN__','','','__ADMIN_SPIP__','5955dbe5f351080b70f8ce2c75deb82445f77042777d5ea8cb07ae5b609312dc','','0minirezo','oui','2017-02-22 00:06:22','','$1$KNqE7vd2$fexIaC70Xcs4s1BJnsykv0','0000-00-00 00:00:00','97513991858acd5fe2e1654.18025636','120403642958acd5fe40a894.55435342',NULL,NULL,'spip','',NULL,NULL); +/*!40000 ALTER TABLE `spip_auteurs` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_auteurs_liens` +-- + +DROP TABLE IF EXISTS `spip_auteurs_liens`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_auteurs_liens` ( + `id_auteur` bigint(21) NOT NULL DEFAULT '0', + `id_objet` bigint(21) NOT NULL DEFAULT '0', + `objet` varchar(25) NOT NULL DEFAULT '', + `vu` varchar(6) NOT NULL DEFAULT 'non', + PRIMARY KEY (`id_auteur`,`id_objet`,`objet`), + KEY `id_auteur` (`id_auteur`), + KEY `id_objet` (`id_objet`), + KEY `objet` (`objet`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_auteurs_liens` +-- + +LOCK TABLES `spip_auteurs_liens` WRITE; +/*!40000 ALTER TABLE `spip_auteurs_liens` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_auteurs_liens` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_breves` +-- + +DROP TABLE IF EXISTS `spip_breves`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_breves` ( + `id_breve` bigint(21) NOT NULL AUTO_INCREMENT, + `date_heure` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `titre` text NOT NULL, + `texte` longtext NOT NULL, + `lien_titre` text NOT NULL, + `lien_url` text NOT NULL, + `statut` varchar(6) NOT NULL DEFAULT '0', + `id_rubrique` bigint(21) NOT NULL DEFAULT '0', + `lang` varchar(10) NOT NULL DEFAULT '', + `langue_choisie` varchar(3) DEFAULT 'non', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_breve`), + KEY `id_rubrique` (`id_rubrique`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_breves` +-- + +LOCK TABLES `spip_breves` WRITE; +/*!40000 ALTER TABLE `spip_breves` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_breves` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_depots` +-- + +DROP TABLE IF EXISTS `spip_depots`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_depots` ( + `id_depot` bigint(21) NOT NULL AUTO_INCREMENT, + `titre` text NOT NULL, + `descriptif` text NOT NULL, + `type` varchar(10) NOT NULL DEFAULT '', + `url_serveur` varchar(255) NOT NULL DEFAULT '', + `url_brouteur` varchar(255) NOT NULL DEFAULT '', + `url_archives` varchar(255) NOT NULL DEFAULT '', + `url_commits` varchar(255) NOT NULL DEFAULT '', + `xml_paquets` varchar(255) NOT NULL DEFAULT '', + `sha_paquets` varchar(40) NOT NULL DEFAULT '', + `nbr_paquets` int(11) NOT NULL DEFAULT '0', + `nbr_plugins` int(11) NOT NULL DEFAULT '0', + `nbr_autres` int(11) NOT NULL DEFAULT '0', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_depot`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_depots` +-- + +LOCK TABLES `spip_depots` WRITE; +/*!40000 ALTER TABLE `spip_depots` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_depots` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_depots_plugins` +-- + +DROP TABLE IF EXISTS `spip_depots_plugins`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_depots_plugins` ( + `id_depot` bigint(21) NOT NULL, + `id_plugin` bigint(21) NOT NULL, + PRIMARY KEY (`id_depot`,`id_plugin`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_depots_plugins` +-- + +LOCK TABLES `spip_depots_plugins` WRITE; +/*!40000 ALTER TABLE `spip_depots_plugins` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_depots_plugins` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_documents` +-- + +DROP TABLE IF EXISTS `spip_documents`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_documents` ( + `id_document` bigint(21) NOT NULL AUTO_INCREMENT, + `id_vignette` bigint(21) NOT NULL DEFAULT '0', + `extension` varchar(10) NOT NULL DEFAULT '', + `titre` text NOT NULL, + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `descriptif` text NOT NULL, + `fichier` text NOT NULL, + `taille` bigint(20) DEFAULT NULL, + `largeur` int(11) DEFAULT NULL, + `hauteur` int(11) DEFAULT NULL, + `media` varchar(10) NOT NULL DEFAULT 'file', + `mode` varchar(10) NOT NULL DEFAULT 'document', + `distant` varchar(3) DEFAULT 'non', + `statut` varchar(10) NOT NULL DEFAULT '0', + `credits` varchar(255) NOT NULL DEFAULT '', + `date_publication` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `brise` tinyint(4) DEFAULT '0', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_document`), + KEY `id_vignette` (`id_vignette`), + KEY `mode` (`mode`), + KEY `extension` (`extension`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_documents` +-- + +LOCK TABLES `spip_documents` WRITE; +/*!40000 ALTER TABLE `spip_documents` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_documents` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_documents_liens` +-- + +DROP TABLE IF EXISTS `spip_documents_liens`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_documents_liens` ( + `id_document` bigint(21) NOT NULL DEFAULT '0', + `id_objet` bigint(21) NOT NULL DEFAULT '0', + `objet` varchar(25) NOT NULL DEFAULT '', + `vu` enum('non','oui') NOT NULL DEFAULT 'non', + PRIMARY KEY (`id_document`,`id_objet`,`objet`), + KEY `id_document` (`id_document`), + KEY `id_objet` (`id_objet`), + KEY `objet` (`objet`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_documents_liens` +-- + +LOCK TABLES `spip_documents_liens` WRITE; +/*!40000 ALTER TABLE `spip_documents_liens` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_documents_liens` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_forum` +-- + +DROP TABLE IF EXISTS `spip_forum`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_forum` ( + `id_forum` bigint(21) NOT NULL AUTO_INCREMENT, + `id_objet` bigint(21) NOT NULL DEFAULT '0', + `objet` varchar(25) NOT NULL DEFAULT '', + `id_parent` bigint(21) NOT NULL DEFAULT '0', + `id_thread` bigint(21) NOT NULL DEFAULT '0', + `date_heure` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `date_thread` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `titre` text NOT NULL, + `texte` mediumtext NOT NULL, + `auteur` text NOT NULL, + `email_auteur` text NOT NULL, + `nom_site` text NOT NULL, + `url_site` text NOT NULL, + `statut` varchar(8) NOT NULL DEFAULT '0', + `ip` varchar(40) NOT NULL DEFAULT '', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `id_auteur` bigint(20) NOT NULL DEFAULT '0', + PRIMARY KEY (`id_forum`), + KEY `id_auteur` (`id_auteur`), + KEY `id_parent` (`id_parent`), + KEY `id_thread` (`id_thread`), + KEY `optimal` (`statut`,`id_parent`,`id_objet`,`objet`,`date_heure`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_forum` +-- + +LOCK TABLES `spip_forum` WRITE; +/*!40000 ALTER TABLE `spip_forum` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_forum` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_groupes_mots` +-- + +DROP TABLE IF EXISTS `spip_groupes_mots`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_groupes_mots` ( + `id_groupe` bigint(21) NOT NULL AUTO_INCREMENT, + `titre` text NOT NULL, + `descriptif` text NOT NULL, + `texte` longtext NOT NULL, + `unseul` varchar(3) NOT NULL DEFAULT '', + `obligatoire` varchar(3) NOT NULL DEFAULT '', + `tables_liees` text NOT NULL, + `minirezo` varchar(3) NOT NULL DEFAULT '', + `comite` varchar(3) NOT NULL DEFAULT '', + `forum` varchar(3) NOT NULL DEFAULT '', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_groupe`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_groupes_mots` +-- + +LOCK TABLES `spip_groupes_mots` WRITE; +/*!40000 ALTER TABLE `spip_groupes_mots` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_groupes_mots` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_jobs` +-- + +DROP TABLE IF EXISTS `spip_jobs`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_jobs` ( + `id_job` bigint(21) NOT NULL AUTO_INCREMENT, + `descriptif` text NOT NULL, + `fonction` varchar(255) NOT NULL, + `args` longblob NOT NULL, + `md5args` char(32) NOT NULL DEFAULT '', + `inclure` varchar(255) NOT NULL, + `priorite` smallint(6) NOT NULL DEFAULT '0', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `status` tinyint(4) NOT NULL DEFAULT '1', + PRIMARY KEY (`id_job`), + KEY `date` (`date`), + KEY `status` (`status`) +) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_jobs` +-- + +LOCK TABLES `spip_jobs` WRITE; +/*!40000 ALTER TABLE `spip_jobs` DISABLE KEYS */; +INSERT INTO `spip_jobs` VALUES (1,'Tâche CRON queue_watch (toutes les 86400 s)','queue_watch','a:1:{i:0;d:1487683770;}','4ac9c0e20e1261177e9fd10eca9d2765','genie/',0,'2017-02-22 00:06:27',1),(2,'Tâche CRON optimiser (toutes les 172800 s)','optimiser','a:1:{i:0;d:1487687192;}','bfddeedfe143a7e3d3c8f5351d973239','genie/',0,'2017-02-22 00:06:27',1),(3,'Tâche CRON invalideur (toutes les 600 s)','invalideur','a:1:{i:0;d:1487721825;}','b80309f70aca458607e41bbfb5736f3c','genie/',0,'2017-02-22 00:06:27',1),(4,'Tâche CRON maintenance (toutes les 7200 s)','maintenance','a:1:{i:0;d:1487717510;}','ac4b0e07b06bdf113d1e6531f6d734c7','genie/',0,'2017-02-22 00:06:27',1),(5,'Tâche CRON mise_a_jour (toutes les 259200 s)','mise_a_jour','a:1:{i:0;d:1487592938;}','6953f26a7d139babf1e0b917637e27b4','genie/',0,'2017-02-22 00:06:27',1),(6,'Tâche CRON optimiser_revisions (toutes les 86400 s)','optimiser_revisions','a:1:{i:0;d:1487652252;}','30ff48e04c43be68bef69246d782465f','genie/',0,'2017-02-22 00:06:27',1),(7,'Tâche CRON svp_actualiser_depots (toutes les 21600 s)','svp_actualiser_depots','a:1:{i:0;d:1487712863;}','baa4283b0e8e181658d57a5b20384ab1','genie/',0,'2017-02-22 00:06:27',1); +/*!40000 ALTER TABLE `spip_jobs` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_jobs_liens` +-- + +DROP TABLE IF EXISTS `spip_jobs_liens`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_jobs_liens` ( + `id_job` bigint(21) NOT NULL DEFAULT '0', + `id_objet` bigint(21) NOT NULL DEFAULT '0', + `objet` varchar(25) NOT NULL DEFAULT '', + PRIMARY KEY (`id_job`,`id_objet`,`objet`), + KEY `id_job` (`id_job`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_jobs_liens` +-- + +LOCK TABLES `spip_jobs_liens` WRITE; +/*!40000 ALTER TABLE `spip_jobs_liens` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_jobs_liens` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_messages` +-- + +DROP TABLE IF EXISTS `spip_messages`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_messages` ( + `id_message` bigint(21) NOT NULL AUTO_INCREMENT, + `titre` text NOT NULL, + `texte` longtext NOT NULL, + `type` varchar(6) NOT NULL DEFAULT '', + `date_heure` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `date_fin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `rv` varchar(3) NOT NULL DEFAULT '', + `statut` varchar(6) NOT NULL DEFAULT '0', + `id_auteur` bigint(21) NOT NULL DEFAULT '0', + `destinataires` text NOT NULL, + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_message`), + KEY `id_auteur` (`id_auteur`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_messages` +-- + +LOCK TABLES `spip_messages` WRITE; +/*!40000 ALTER TABLE `spip_messages` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_messages` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_meta` +-- + +DROP TABLE IF EXISTS `spip_meta`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_meta` ( + `nom` varchar(255) NOT NULL, + `valeur` text, + `impt` enum('non','oui') NOT NULL DEFAULT 'oui', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`nom`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_meta` +-- + +LOCK TABLES `spip_meta` WRITE; +/*!40000 ALTER TABLE `spip_meta` DISABLE KEYS */; +INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','fr','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','cyp@rouquin.me','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://debile.ddns.net/spip','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','fr','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); +/*!40000 ALTER TABLE `spip_meta` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_mots` +-- + +DROP TABLE IF EXISTS `spip_mots`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_mots` ( + `id_mot` bigint(21) NOT NULL AUTO_INCREMENT, + `titre` text NOT NULL, + `descriptif` text NOT NULL, + `texte` longtext NOT NULL, + `id_groupe` bigint(21) NOT NULL DEFAULT '0', + `type` text NOT NULL, + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_mot`), + KEY `id_groupe` (`id_groupe`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_mots` +-- + +LOCK TABLES `spip_mots` WRITE; +/*!40000 ALTER TABLE `spip_mots` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_mots` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_mots_liens` +-- + +DROP TABLE IF EXISTS `spip_mots_liens`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_mots_liens` ( + `id_mot` bigint(21) NOT NULL DEFAULT '0', + `id_objet` bigint(21) NOT NULL DEFAULT '0', + `objet` varchar(25) NOT NULL DEFAULT '', + PRIMARY KEY (`id_mot`,`id_objet`,`objet`), + KEY `id_mot` (`id_mot`), + KEY `id_objet` (`id_objet`), + KEY `objet` (`objet`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_mots_liens` +-- + +LOCK TABLES `spip_mots_liens` WRITE; +/*!40000 ALTER TABLE `spip_mots_liens` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_mots_liens` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_paquets` +-- + +DROP TABLE IF EXISTS `spip_paquets`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_paquets` ( + `id_paquet` bigint(21) NOT NULL AUTO_INCREMENT, + `id_plugin` bigint(21) NOT NULL, + `prefixe` varchar(30) NOT NULL DEFAULT '', + `logo` varchar(255) NOT NULL DEFAULT '', + `version` varchar(24) NOT NULL DEFAULT '', + `version_base` varchar(24) NOT NULL DEFAULT '', + `compatibilite_spip` varchar(24) NOT NULL DEFAULT '', + `branches_spip` varchar(255) NOT NULL DEFAULT '', + `description` text NOT NULL, + `auteur` text NOT NULL, + `credit` text NOT NULL, + `licence` text NOT NULL, + `copyright` text NOT NULL, + `lien_doc` text NOT NULL, + `lien_demo` text NOT NULL, + `lien_dev` text NOT NULL, + `etat` varchar(16) NOT NULL DEFAULT '', + `etatnum` int(1) NOT NULL DEFAULT '0', + `dependances` text NOT NULL, + `procure` text NOT NULL, + `date_crea` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `date_modif` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `id_depot` bigint(21) NOT NULL DEFAULT '0', + `nom_archive` varchar(255) NOT NULL DEFAULT '', + `nbo_archive` int(11) NOT NULL DEFAULT '0', + `maj_archive` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `src_archive` varchar(255) NOT NULL DEFAULT '', + `traductions` text NOT NULL, + `actif` varchar(3) NOT NULL DEFAULT 'non', + `installe` varchar(3) NOT NULL DEFAULT 'non', + `recent` int(2) NOT NULL DEFAULT '0', + `maj_version` varchar(255) NOT NULL DEFAULT '', + `superieur` varchar(3) NOT NULL DEFAULT 'non', + `obsolete` varchar(3) NOT NULL DEFAULT 'non', + `attente` varchar(3) NOT NULL DEFAULT 'non', + `constante` varchar(30) NOT NULL DEFAULT '', + `signature` varchar(32) NOT NULL DEFAULT '', + PRIMARY KEY (`id_paquet`), + KEY `id_plugin` (`id_plugin`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_paquets` +-- + +LOCK TABLES `spip_paquets` WRITE; +/*!40000 ALTER TABLE `spip_paquets` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_paquets` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_petitions` +-- + +DROP TABLE IF EXISTS `spip_petitions`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_petitions` ( + `id_petition` bigint(21) NOT NULL AUTO_INCREMENT, + `id_article` bigint(21) NOT NULL DEFAULT '0', + `email_unique` char(3) NOT NULL DEFAULT '', + `site_obli` char(3) NOT NULL DEFAULT '', + `site_unique` char(3) NOT NULL DEFAULT '', + `message` char(3) NOT NULL DEFAULT '', + `texte` longtext NOT NULL, + `statut` varchar(10) NOT NULL DEFAULT 'publie', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_petition`), + UNIQUE KEY `id_article` (`id_article`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_petitions` +-- + +LOCK TABLES `spip_petitions` WRITE; +/*!40000 ALTER TABLE `spip_petitions` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_petitions` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_plugins` +-- + +DROP TABLE IF EXISTS `spip_plugins`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_plugins` ( + `id_plugin` bigint(21) NOT NULL AUTO_INCREMENT, + `prefixe` varchar(30) NOT NULL DEFAULT '', + `nom` text NOT NULL, + `slogan` text NOT NULL, + `categorie` varchar(100) NOT NULL DEFAULT '', + `tags` text NOT NULL, + `vmax` varchar(24) NOT NULL DEFAULT '', + `date_crea` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `date_modif` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `compatibilite_spip` varchar(24) NOT NULL DEFAULT '', + `branches_spip` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id_plugin`), + KEY `prefixe` (`prefixe`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_plugins` +-- + +LOCK TABLES `spip_plugins` WRITE; +/*!40000 ALTER TABLE `spip_plugins` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_plugins` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_referers` +-- + +DROP TABLE IF EXISTS `spip_referers`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_referers` ( + `referer_md5` bigint(20) unsigned NOT NULL, + `date` date NOT NULL, + `referer` varchar(255) DEFAULT NULL, + `visites` int(10) unsigned NOT NULL, + `visites_jour` int(10) unsigned NOT NULL, + `visites_veille` int(10) unsigned NOT NULL, + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`referer_md5`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_referers` +-- + +LOCK TABLES `spip_referers` WRITE; +/*!40000 ALTER TABLE `spip_referers` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_referers` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_referers_articles` +-- + +DROP TABLE IF EXISTS `spip_referers_articles`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_referers_articles` ( + `id_article` int(10) unsigned NOT NULL, + `referer_md5` bigint(20) unsigned NOT NULL, + `referer` varchar(255) NOT NULL DEFAULT '', + `visites` int(10) unsigned NOT NULL, + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_article`,`referer_md5`), + KEY `referer_md5` (`referer_md5`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_referers_articles` +-- + +LOCK TABLES `spip_referers_articles` WRITE; +/*!40000 ALTER TABLE `spip_referers_articles` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_referers_articles` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_resultats` +-- + +DROP TABLE IF EXISTS `spip_resultats`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_resultats` ( + `recherche` char(16) NOT NULL DEFAULT '', + `id` int(10) unsigned NOT NULL, + `points` int(10) unsigned NOT NULL DEFAULT '0', + `table_objet` varchar(30) NOT NULL DEFAULT '', + `serveur` char(16) NOT NULL DEFAULT '', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_resultats` +-- + +LOCK TABLES `spip_resultats` WRITE; +/*!40000 ALTER TABLE `spip_resultats` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_resultats` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_rubriques` +-- + +DROP TABLE IF EXISTS `spip_rubriques`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_rubriques` ( + `id_rubrique` bigint(21) NOT NULL AUTO_INCREMENT, + `id_parent` bigint(21) NOT NULL DEFAULT '0', + `titre` text NOT NULL, + `descriptif` text NOT NULL, + `texte` longtext NOT NULL, + `id_secteur` bigint(21) NOT NULL DEFAULT '0', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `statut` varchar(10) NOT NULL DEFAULT '0', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `lang` varchar(10) NOT NULL DEFAULT '', + `langue_choisie` varchar(3) DEFAULT 'non', + `statut_tmp` varchar(10) NOT NULL DEFAULT '0', + `date_tmp` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `profondeur` smallint(5) NOT NULL DEFAULT '0', + PRIMARY KEY (`id_rubrique`), + KEY `lang` (`lang`), + KEY `id_parent` (`id_parent`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_rubriques` +-- + +LOCK TABLES `spip_rubriques` WRITE; +/*!40000 ALTER TABLE `spip_rubriques` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_rubriques` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_signatures` +-- + +DROP TABLE IF EXISTS `spip_signatures`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_signatures` ( + `id_signature` bigint(21) NOT NULL AUTO_INCREMENT, + `id_petition` bigint(21) NOT NULL DEFAULT '0', + `date_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `nom_email` text NOT NULL, + `ad_email` text NOT NULL, + `nom_site` text NOT NULL, + `url_site` text NOT NULL, + `message` mediumtext NOT NULL, + `statut` varchar(10) NOT NULL DEFAULT '0', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id_signature`), + KEY `id_petition` (`id_petition`), + KEY `statut` (`statut`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_signatures` +-- + +LOCK TABLES `spip_signatures` WRITE; +/*!40000 ALTER TABLE `spip_signatures` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_signatures` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_syndic` +-- + +DROP TABLE IF EXISTS `spip_syndic`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_syndic` ( + `id_syndic` bigint(21) NOT NULL AUTO_INCREMENT, + `id_rubrique` bigint(21) NOT NULL DEFAULT '0', + `id_secteur` bigint(21) NOT NULL DEFAULT '0', + `nom_site` text NOT NULL, + `url_site` text NOT NULL, + `url_syndic` text NOT NULL, + `descriptif` text NOT NULL, + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `syndication` varchar(3) NOT NULL DEFAULT '', + `statut` varchar(10) NOT NULL DEFAULT '0', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `date_syndic` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `date_index` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `moderation` varchar(3) DEFAULT 'non', + `miroir` varchar(3) DEFAULT 'non', + `oubli` varchar(3) DEFAULT 'non', + `resume` varchar(3) DEFAULT 'oui', + PRIMARY KEY (`id_syndic`), + KEY `id_rubrique` (`id_rubrique`), + KEY `id_secteur` (`id_secteur`), + KEY `statut` (`statut`,`date_syndic`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_syndic` +-- + +LOCK TABLES `spip_syndic` WRITE; +/*!40000 ALTER TABLE `spip_syndic` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_syndic` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_syndic_articles` +-- + +DROP TABLE IF EXISTS `spip_syndic_articles`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_syndic_articles` ( + `id_syndic_article` bigint(21) NOT NULL AUTO_INCREMENT, + `id_syndic` bigint(21) NOT NULL DEFAULT '0', + `titre` text NOT NULL, + `url` text NOT NULL, + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `lesauteurs` text NOT NULL, + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `statut` varchar(10) NOT NULL DEFAULT '0', + `descriptif` text NOT NULL, + `lang` varchar(10) NOT NULL DEFAULT '', + `url_source` tinytext NOT NULL, + `source` tinytext NOT NULL, + `tags` text NOT NULL, + PRIMARY KEY (`id_syndic_article`), + KEY `id_syndic` (`id_syndic`), + KEY `statut` (`statut`), + KEY `url` (`url`(255)) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_syndic_articles` +-- + +LOCK TABLES `spip_syndic_articles` WRITE; +/*!40000 ALTER TABLE `spip_syndic_articles` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_syndic_articles` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_types_documents` +-- + +DROP TABLE IF EXISTS `spip_types_documents`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_types_documents` ( + `extension` varchar(10) NOT NULL DEFAULT '', + `titre` text NOT NULL, + `descriptif` text NOT NULL, + `mime_type` varchar(100) NOT NULL DEFAULT '', + `inclus` enum('non','image','embed') NOT NULL DEFAULT 'non', + `upload` enum('oui','non') NOT NULL DEFAULT 'oui', + `media_defaut` varchar(10) NOT NULL DEFAULT 'file', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`extension`), + KEY `inclus` (`inclus`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_types_documents` +-- + +LOCK TABLES `spip_types_documents` WRITE; +/*!40000 ALTER TABLE `spip_types_documents` DISABLE KEYS */; +INSERT INTO `spip_types_documents` VALUES ('jpg','JPEG','','image/jpeg','image','oui','image','2017-02-22 00:06:29'),('png','PNG','','image/png','image','oui','image','2017-02-22 00:06:29'),('gif','GIF','','image/gif','image','oui','image','2017-02-22 00:06:29'),('bmp','BMP','','image/x-ms-bmp','image','oui','image','2017-02-22 00:06:29'),('tif','TIFF','','image/tiff','embed','oui','image','2017-02-22 00:06:29'),('aac','Advanced Audio Coding','','audio/mp4a-latm','embed','oui','audio','2017-02-22 00:06:29'),('ac3','AC-3 Compressed Audio','','audio/x-aac','embed','oui','audio','2017-02-22 00:06:29'),('aifc','Compressed AIFF Audio','','audio/x-aifc','embed','oui','audio','2017-02-22 00:06:29'),('aiff','AIFF','','audio/x-aiff','embed','oui','audio','2017-02-22 00:06:29'),('amr','Adaptive Multi-Rate Audio','','audio/amr','embed','oui','audio','2017-02-22 00:06:29'),('ape','Monkey\'s Audio File','','audio/x-monkeys-audio','embed','oui','audio','2017-02-22 00:06:29'),('asf','Windows Media','','video/x-ms-asf','embed','oui','video','2017-02-22 00:06:29'),('avi','AVI','','video/x-msvideo','embed','oui','video','2017-02-22 00:06:29'),('anx','Annodex','','application/annodex','embed','oui','file','2017-02-22 00:06:29'),('axa','Annodex Audio','','audio/annodex','embed','oui','audio','2017-02-22 00:06:29'),('axv','Annodex Video','','video/annodex','embed','oui','video','2017-02-22 00:06:29'),('dv','Digital Video','','video/x-dv','embed','oui','video','2017-02-22 00:06:29'),('f4a','Audio for Adobe Flash Player','','audio/mp4','embed','oui','audio','2017-02-22 00:06:29'),('f4b','Audio Book for Adobe Flash Player','','audio/mp4','embed','oui','audio','2017-02-22 00:06:29'),('f4p','Protected Video for Adobe Flash Player','','video/mp4','embed','oui','video','2017-02-22 00:06:29'),('f4v','Video for Adobe Flash Player','','video/mp4','embed','oui','video','2017-02-22 00:06:29'),('flac','Free Lossless Audio Codec','','audio/x-flac','embed','oui','audio','2017-02-22 00:06:29'),('flv','Flash Video','','video/x-flv','embed','oui','video','2017-02-22 00:06:29'),('m2p','MPEG-PS','','video/MP2P','embed','oui','video','2017-02-22 00:06:29'),('m2ts','BDAV MPEG-2 Transport Stream','','video/MP2T','embed','oui','video','2017-02-22 00:06:29'),('m4a','MPEG4 Audio','','audio/mp4a-latm','embed','oui','audio','2017-02-22 00:06:29'),('m4b','MPEG4 Audio','','audio/mp4a-latm','embed','oui','audio','2017-02-22 00:06:29'),('m4p','MPEG4 Audio','','audio/mp4a-latm','embed','oui','audio','2017-02-22 00:06:29'),('m4r','iPhone Ringtone','','audio/aac','embed','oui','audio','2017-02-22 00:06:29'),('m4u','MPEG4 Playlist','','video/vnd.mpegurl','non','oui','video','2017-02-22 00:06:29'),('m4v','MPEG4 Video','','video/x-m4v','embed','oui','video','2017-02-22 00:06:29'),('mid','Midi','','audio/midi','embed','oui','audio','2017-02-22 00:06:29'),('mka','Matroska Audio','','audio/mka','embed','oui','audio','2017-02-22 00:06:29'),('mkv','Matroska Video','','video/mkv','embed','oui','video','2017-02-22 00:06:29'),('mng','MNG','','video/x-mng','embed','oui','video','2017-02-22 00:06:29'),('mov','QuickTime','','video/quicktime','embed','oui','video','2017-02-22 00:06:29'),('mp3','MP3','','audio/mpeg','embed','oui','audio','2017-02-22 00:06:29'),('mp4','MPEG4','','application/mp4','embed','oui','video','2017-02-22 00:06:29'),('mpc','Musepack','','audio/x-musepack','embed','oui','audio','2017-02-22 00:06:29'),('mpg','MPEG','','video/mpeg','embed','oui','video','2017-02-22 00:06:29'),('mts','AVCHD MPEG-2 transport stream','','video/MP2T','embed','oui','video','2017-02-22 00:06:29'),('oga','Ogg Audio','','audio/ogg','embed','oui','audio','2017-02-22 00:06:29'),('ogg','Ogg Vorbis','','audio/ogg','embed','oui','audio','2017-02-22 00:06:29'),('ogv','Ogg Video','','video/ogg','embed','oui','video','2017-02-22 00:06:29'),('ogx','Ogg Multiplex','','application/ogg','embed','oui','video','2017-02-22 00:06:29'),('qt','QuickTime','','video/quicktime','embed','oui','video','2017-02-22 00:06:29'),('ra','RealAudio','','audio/x-pn-realaudio','embed','oui','audio','2017-02-22 00:06:29'),('ram','RealAudio','','audio/x-pn-realaudio','embed','oui','audio','2017-02-22 00:06:29'),('rm','RealAudio','','audio/x-pn-realaudio','embed','oui','audio','2017-02-22 00:06:29'),('spx','Ogg Speex','','audio/ogg','embed','oui','audio','2017-02-22 00:06:29'),('svg','Scalable Vector Graphics','','image/svg+xml','embed','oui','image','2017-02-22 00:06:29'),('svgz','Compressed Scalable Vector Graphic','','image/svg+xml','embed','oui','image','2017-02-22 00:06:29'),('swf','Flash','','application/x-shockwave-flash','embed','oui','video','2017-02-22 00:06:29'),('ts','MPEG transport stream','','video/MP2T','embed','oui','video','2017-02-22 00:06:29'),('wav','WAV','','audio/x-wav','embed','oui','audio','2017-02-22 00:06:29'),('webm','WebM','','video/webm','embed','oui','video','2017-02-22 00:06:29'),('wma','Windows Media Audio','','audio/x-ms-wma','embed','oui','audio','2017-02-22 00:06:29'),('wmv','Windows Media Video','','video/x-ms-wmv','embed','oui','video','2017-02-22 00:06:29'),('y4m','YUV4MPEG2','','video/x-raw-yuv','embed','oui','video','2017-02-22 00:06:29'),('3gp','3rd Generation Partnership Project','','video/3gpp','embed','oui','video','2017-02-22 00:06:29'),('3ga','3GP Audio File','','audio/3ga','embed','oui','audio','2017-02-22 00:06:29'),('7z','7 Zip','','application/x-7z-compressed','non','oui','file','2017-02-22 00:06:29'),('ai','Adobe Illustrator','','application/illustrator','non','oui','image','2017-02-22 00:06:29'),('abw','Abiword','','application/abiword','non','oui','file','2017-02-22 00:06:29'),('asx','Advanced Stream Redirector','','video/x-ms-asf','non','oui','video','2017-02-22 00:06:29'),('bib','BibTeX','','application/x-bibtex','non','oui','file','2017-02-22 00:06:29'),('bin','Binary Data','','application/octet-stream','non','oui','file','2017-02-22 00:06:29'),('blend','Blender','','application/x-blender','non','oui','file','2017-02-22 00:06:29'),('bz2','BZip','','application/x-bzip2','non','oui','file','2017-02-22 00:06:29'),('c','C source','','text/x-csrc','non','oui','file','2017-02-22 00:06:29'),('csl','Citation Style Language','','application/xml','non','oui','file','2017-02-22 00:06:29'),('css','Cascading Style Sheet','','text/css','non','oui','file','2017-02-22 00:06:29'),('csv','Comma Separated Values','','text/csv','non','oui','file','2017-02-22 00:06:29'),('deb','Debian','','application/x-debian-package','non','oui','file','2017-02-22 00:06:29'),('doc','Word','','application/msword','non','oui','file','2017-02-22 00:06:29'),('dot','Word Template','','application/msword','non','oui','file','2017-02-22 00:06:29'),('djvu','DjVu','','image/vnd.djvu','non','oui','image','2017-02-22 00:06:29'),('dvi','LaTeX DVI','','application/x-dvi','non','oui','file','2017-02-22 00:06:29'),('emf','Enhanced Metafile','','image/x-emf','non','oui','image','2017-02-22 00:06:29'),('enl','EndNote Library','','application/octet-stream','non','oui','file','2017-02-22 00:06:29'),('ens','EndNote Style','','application/octet-stream','non','oui','file','2017-02-22 00:06:29'),('eps','PostScript','','application/postscript','non','oui','file','2017-02-22 00:06:29'),('epub','EPUB','','application/epub+zip','non','oui','file','2017-02-22 00:06:29'),('gpx','GPS eXchange Format','','application/gpx+xml','non','oui','file','2017-02-22 00:06:29'),('gz','GZ','','application/x-gzip','non','oui','file','2017-02-22 00:06:29'),('h','C header','','text/x-chdr','non','oui','file','2017-02-22 00:06:29'),('html','HTML','','text/html','non','oui','file','2017-02-22 00:06:29'),('ics','iCalendar','','text/calendar','non','oui','file','2017-02-22 00:06:29'),('jar','Java Archive','','application/java-archive','non','oui','file','2017-02-22 00:06:29'),('json','JSON','','application/json','non','oui','file','2017-02-22 00:06:29'),('kml','Keyhole Markup Language','','application/vnd.google-earth.kml+xml','non','oui','file','2017-02-22 00:06:29'),('kmz','Google Earth Placemark File','','application/vnd.google-earth.kmz','non','oui','file','2017-02-22 00:06:29'),('lyx','Lyx file','','application/x-lyx','non','oui','file','2017-02-22 00:06:29'),('m3u','M3U Playlist','','text/plain','non','oui','file','2017-02-22 00:06:29'),('m3u8','M3U8 Playlist','','text/plain','non','oui','file','2017-02-22 00:06:29'),('mathml','MathML','','application/mathml+xml','non','oui','file','2017-02-22 00:06:29'),('mbtiles','MBTiles','','application/x-sqlite3','non','oui','file','2017-02-22 00:06:29'),('md','Markdown Document','','text/x-markdown','non','oui','file','2017-02-22 00:06:29'),('pas','Pascal','','text/x-pascal','non','oui','file','2017-02-22 00:06:29'),('pdf','PDF','','application/pdf','non','oui','file','2017-02-22 00:06:29'),('pgn','Portable Game Notation','','application/x-chess-pgn','non','oui','file','2017-02-22 00:06:30'),('pls','Playlist','','text/plain','non','oui','file','2017-02-22 00:06:30'),('ppt','PowerPoint','','application/vnd.ms-powerpoint','non','oui','file','2017-02-22 00:06:30'),('pot','PowerPoint Template','','application/vnd.ms-powerpoint','non','oui','file','2017-02-22 00:06:30'),('ps','PostScript','','application/postscript','non','oui','file','2017-02-22 00:06:30'),('psd','Photoshop','','image/x-photoshop','non','oui','image','2017-02-22 00:06:30'),('rar','WinRAR','','application/x-rar-compressed','non','oui','file','2017-02-22 00:06:30'),('rdf','Resource Description Framework','','application/rdf+xml','non','oui','file','2017-02-22 00:06:30'),('ris','RIS','','application/x-research-info-systems','non','oui','file','2017-02-22 00:06:30'),('rpm','RedHat/Mandrake/SuSE','','application/x-redhat-package-manager','non','oui','file','2017-02-22 00:06:30'),('rtf','RTF','','application/rtf','non','oui','file','2017-02-22 00:06:30'),('sdc','StarOffice Spreadsheet','','application/vnd.stardivision.calc','non','oui','file','2017-02-22 00:06:30'),('sdd','StarOffice Presentation','','application/vnd.stardivision.impress','non','oui','file','2017-02-22 00:06:30'),('sdw','StarOffice Writer document','','application/vnd.stardivision.writer','non','oui','file','2017-02-22 00:06:30'),('sit','Stuffit','','application/x-stuffit','non','oui','file','2017-02-22 00:06:30'),('sla','Scribus','','application/x-scribus','non','oui','file','2017-02-22 00:06:30'),('srt','SubRip Subtitle','','text/plain','non','oui','file','2017-02-22 00:06:30'),('ssa','SubStation Alpha Subtitle','','text/plain','non','oui','file','2017-02-22 00:06:30'),('sxc','OpenOffice.org Calc','','application/vnd.sun.xml.calc','non','oui','file','2017-02-22 00:06:30'),('sxi','OpenOffice.org Impress','','application/vnd.sun.xml.impress','non','oui','file','2017-02-22 00:06:30'),('sxw','OpenOffice.org','','application/vnd.sun.xml.writer','non','oui','file','2017-02-22 00:06:30'),('tar','Tar','','application/x-tar','non','oui','file','2017-02-22 00:06:30'),('tex','LaTeX','','text/x-tex','non','oui','file','2017-02-22 00:06:30'),('tgz','TGZ','','application/x-gtar','non','oui','file','2017-02-22 00:06:30'),('torrent','BitTorrent','','application/x-bittorrent','non','oui','file','2017-02-22 00:06:30'),('ttf','TTF Font','','application/x-font-ttf','non','oui','file','2017-02-22 00:06:30'),('txt','Texte','','text/plain','non','oui','file','2017-02-22 00:06:30'),('usf','Universal Subtitle Format','','application/xml','non','oui','file','2017-02-22 00:06:30'),('vcf','vCard','','text/vcard','non','oui','file','2017-02-22 00:06:30'),('xcf','GIMP multi-layer','','application/x-xcf','non','oui','file','2017-02-22 00:06:30'),('xls','Excel','','application/vnd.ms-excel','non','oui','file','2017-02-22 00:06:30'),('xlt','Excel Template','','application/vnd.ms-excel','non','oui','file','2017-02-22 00:06:30'),('wmf','Windows Metafile','','image/x-emf','non','oui','image','2017-02-22 00:06:30'),('wpl','Windows Media Player Playlist','','application/vnd.ms-wpl','non','oui','file','2017-02-22 00:06:30'),('xspf','XSPF','','application/xspf+xml','non','oui','file','2017-02-22 00:06:30'),('xml','XML','','application/xml','non','oui','file','2017-02-22 00:06:30'),('yaml','YAML','','text/yaml','non','oui','file','2017-02-22 00:06:30'),('zip','Zip','','application/zip','non','oui','file','2017-02-22 00:06:30'),('odt','OpenDocument Text','','application/vnd.oasis.opendocument.text','non','oui','file','2017-02-22 00:06:30'),('ods','OpenDocument Spreadsheet','','application/vnd.oasis.opendocument.spreadsheet','non','oui','file','2017-02-22 00:06:30'),('odp','OpenDocument Presentation','','application/vnd.oasis.opendocument.presentation','non','oui','file','2017-02-22 00:06:30'),('odg','OpenDocument Graphics','','application/vnd.oasis.opendocument.graphics','non','oui','file','2017-02-22 00:06:30'),('odc','OpenDocument Chart','','application/vnd.oasis.opendocument.chart','non','oui','file','2017-02-22 00:06:30'),('odf','OpenDocument Formula','','application/vnd.oasis.opendocument.formula','non','oui','file','2017-02-22 00:06:30'),('odb','OpenDocument Database','','application/vnd.oasis.opendocument.database','non','oui','file','2017-02-22 00:06:30'),('odi','OpenDocument Image','','application/vnd.oasis.opendocument.image','non','oui','file','2017-02-22 00:06:30'),('odm','OpenDocument Text-master','','application/vnd.oasis.opendocument.text-master','non','oui','file','2017-02-22 00:06:30'),('ott','OpenDocument Text-template','','application/vnd.oasis.opendocument.text-template','non','oui','file','2017-02-22 00:06:30'),('ots','OpenDocument Spreadsheet-template','','application/vnd.oasis.opendocument.spreadsheet-template','non','oui','file','2017-02-22 00:06:30'),('otp','OpenDocument Presentation-template','','application/vnd.oasis.opendocument.presentation-template','non','oui','file','2017-02-22 00:06:30'),('otg','OpenDocument Graphics-template','','application/vnd.oasis.opendocument.graphics-template','non','oui','file','2017-02-22 00:06:30'),('cls','LaTeX Class','','text/x-tex','non','oui','file','2017-02-22 00:06:30'),('sty','LaTeX Style Sheet','','text/x-tex','non','oui','file','2017-02-22 00:06:30'),('docm','Word','','application/vnd.ms-word.document.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('docx','Word','','application/vnd.openxmlformats-officedocument.wordprocessingml.document','non','oui','file','2017-02-22 00:06:30'),('dotm','Word template','','application/vnd.ms-word.template.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('dotx','Word template','','application/vnd.openxmlformats-officedocument.wordprocessingml.template','non','oui','file','2017-02-22 00:06:30'),('potm','Powerpoint template','','application/vnd.ms-powerpoint.template.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('potx','Powerpoint template','','application/vnd.openxmlformats-officedocument.presentationml.template','non','oui','file','2017-02-22 00:06:30'),('ppam','Powerpoint addin','','application/vnd.ms-powerpoint.addin.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('ppsm','Powerpoint slideshow','','application/vnd.ms-powerpoint.slideshow.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('ppsx','Powerpoint slideshow','','application/vnd.openxmlformats-officedocument.presentationml.slideshow','non','oui','file','2017-02-22 00:06:30'),('pptm','Powerpoint','','application/vnd.ms-powerpoint.presentation.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('pptx','Powerpoint','','application/vnd.openxmlformats-officedocument.presentationml.presentation','non','oui','file','2017-02-22 00:06:30'),('xlam','Excel','','application/vnd.ms-excel.addin.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('xlsb','Excel binary','','application/vnd.ms-excel.sheet.binary.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('xlsm','Excel','','application/vnd.ms-excel.sheet.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('xlsx','Excel','','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','non','oui','file','2017-02-22 00:06:30'),('xltm','Excel template','','application/vnd.ms-excel.template.macroEnabled.12','non','oui','file','2017-02-22 00:06:30'),('xltx','Excel template','','application/vnd.openxmlformats-officedocument.spreadsheetml.template','non','oui','file','2017-02-22 00:06:30'); +/*!40000 ALTER TABLE `spip_types_documents` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_urls` +-- + +DROP TABLE IF EXISTS `spip_urls`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_urls` ( + `id_parent` bigint(21) NOT NULL DEFAULT '0', + `url` varchar(255) NOT NULL, + `type` varchar(25) NOT NULL DEFAULT 'article', + `id_objet` bigint(21) NOT NULL, + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `segments` smallint(3) NOT NULL DEFAULT '1', + `perma` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`id_parent`,`url`), + KEY `type` (`type`,`id_objet`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_urls` +-- + +LOCK TABLES `spip_urls` WRITE; +/*!40000 ALTER TABLE `spip_urls` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_urls` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_versions` +-- + +DROP TABLE IF EXISTS `spip_versions`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_versions` ( + `id_version` bigint(21) NOT NULL DEFAULT '0', + `id_objet` bigint(21) NOT NULL DEFAULT '0', + `objet` varchar(25) NOT NULL DEFAULT '', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `id_auteur` varchar(23) NOT NULL DEFAULT '', + `titre_version` text NOT NULL, + `permanent` char(3) NOT NULL DEFAULT '', + `champs` text NOT NULL, + PRIMARY KEY (`id_version`,`id_objet`,`objet`), + KEY `id_version` (`id_version`), + KEY `id_objet` (`id_objet`), + KEY `objet` (`objet`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_versions` +-- + +LOCK TABLES `spip_versions` WRITE; +/*!40000 ALTER TABLE `spip_versions` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_versions` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_versions_fragments` +-- + +DROP TABLE IF EXISTS `spip_versions_fragments`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_versions_fragments` ( + `id_fragment` int(10) unsigned NOT NULL DEFAULT '0', + `version_min` int(10) unsigned NOT NULL DEFAULT '0', + `version_max` int(10) unsigned NOT NULL DEFAULT '0', + `id_objet` bigint(21) NOT NULL, + `objet` varchar(25) NOT NULL DEFAULT '', + `compress` tinyint(4) NOT NULL, + `fragment` longblob, + PRIMARY KEY (`id_objet`,`objet`,`id_fragment`,`version_min`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_versions_fragments` +-- + +LOCK TABLES `spip_versions_fragments` WRITE; +/*!40000 ALTER TABLE `spip_versions_fragments` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_versions_fragments` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_visites` +-- + +DROP TABLE IF EXISTS `spip_visites`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_visites` ( + `date` date NOT NULL, + `visites` int(10) unsigned NOT NULL DEFAULT '0', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`date`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_visites` +-- + +LOCK TABLES `spip_visites` WRITE; +/*!40000 ALTER TABLE `spip_visites` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_visites` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `spip_visites_articles` +-- + +DROP TABLE IF EXISTS `spip_visites_articles`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `spip_visites_articles` ( + `date` date NOT NULL, + `id_article` int(10) unsigned NOT NULL, + `visites` int(10) unsigned NOT NULL DEFAULT '0', + `maj` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`date`,`id_article`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `spip_visites_articles` +-- + +LOCK TABLES `spip_visites_articles` WRITE; +/*!40000 ALTER TABLE `spip_visites_articles` DISABLE KEYS */; +/*!40000 ALTER TABLE `spip_visites_articles` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2017-02-22 0:07:20 diff --git a/scripts/install b/scripts/install index 63fe196..14152f8 100644 --- a/scripts/install +++ b/scripts/install @@ -70,6 +70,14 @@ sudo cp ../conf/connect.php $final_path/config/connect.php sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/config/connect.php sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/connect.php +# Changer les informations de la tables spip_auteurs +sudo sed -i "s@__ADMIN_SPIP__@$admin_spip@g" ../conf/sql/spip.sql +sudo sed -i "s@__DB_USER__@$db_user@g" ../conf/sql/spip.sql +sudo sed -i "s@__DOMAIN__@$admin_spip@g" ../conf/sql/spip.sql + +# Charger la structure des tables dans la base. +mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/spip.sql + # Donne un accès public pour curl ynh_app_setting_set $app unprotected_uris "/" From aa2e06d703d189110362ed5cf57d131585969934 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 01:59:00 +0100 Subject: [PATCH 37/97] Configuration de l'utilisateur --- conf/sql/spip.sql | 2 +- scripts/install | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql index c96ff97..33212e3 100644 --- a/conf/sql/spip.sql +++ b/conf/sql/spip.sql @@ -111,7 +111,7 @@ CREATE TABLE `spip_auteurs` ( LOCK TABLES `spip_auteurs` WRITE; /*!40000 ALTER TABLE `spip_auteurs` DISABLE KEYS */; -INSERT INTO `spip_auteurs` VALUES (1,'__DB_USER__','','__DB_USER__@__DOMAIN__','','','__ADMIN_SPIP__','5955dbe5f351080b70f8ce2c75deb82445f77042777d5ea8cb07ae5b609312dc','','0minirezo','oui','2017-02-22 00:06:22','','$1$KNqE7vd2$fexIaC70Xcs4s1BJnsykv0','0000-00-00 00:00:00','97513991858acd5fe2e1654.18025636','120403642958acd5fe40a894.55435342',NULL,NULL,'spip','',NULL,NULL); +INSERT INTO `spip_auteurs` VALUES (1,'__DB_USER__','','__ADMIN_SPIP__@__DOMAIN__','','','__ADMIN_SPIP__','__DB_SHA__','','0minirezo','oui','2017-02-22 00:06:22','','__DB_PWD__','0000-00-00 00:00:00','__ALEA_ACTUEL__','__ALEA_FUTUR__',NULL,NULL,'spip','',NULL,NULL); /*!40000 ALTER TABLE `spip_auteurs` ENABLE KEYS */; UNLOCK TABLES; diff --git a/scripts/install b/scripts/install index 14152f8..a18cfb4 100644 --- a/scripts/install +++ b/scripts/install @@ -68,12 +68,30 @@ sudo cp ../conf/connect.php $final_path/config/connect.php # Changer les variables du ficher de configuration de SPIP sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/config/connect.php -sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/connect.php +sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/connect.php + +db_md5=$(echo $db_pwd | md5sum | awk '{print $1}') +db_sha=$(echo $db_pwd | openssl dgst -sha1 -hmac "key" | awk -F'= ' {'print $2'}) # Changer les informations de la tables spip_auteurs sudo sed -i "s@__ADMIN_SPIP__@$admin_spip@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_USER__@$db_user@g" ../conf/sql/spip.sql -sudo sed -i "s@__DOMAIN__@$admin_spip@g" ../conf/sql/spip.sql +sudo sed -i "s@__DB_PWD__@$db_md5@g" ../conf/sql/spip.sql +sudo sed -i "s@__DOMAIN__@$domain@g" ../conf/sql/spip.sql +sudo sed -i "s@__DB_SHA__@$db_sha@g" ../conf/sql/spip.sql + +for i in 1 2 3 4 5 6 7 8 +do + j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p') + if [ "$j" = "" ]; + then + # For obscure reasons, the loop is too fast at execution + sleep 1 + j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p') + fi + sudo sed -i "s/__ALEA_ACTUEL__/$j/g" ../conf/sql/spip.sql + sudo sed -i "s/__ALEA_FUTUR__/$j/g" ../conf/sql/spip.sql +done # Charger la structure des tables dans la base. mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/spip.sql From 7834e2ddc59f7828d87a3ea3a0ea56bc0f3abb85 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 02:04:28 +0100 Subject: [PATCH 38/97] Coquille sur le nom d'utilisateur dans le fichier sql --- conf/sql/spip.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql index 33212e3..56f521c 100644 --- a/conf/sql/spip.sql +++ b/conf/sql/spip.sql @@ -111,7 +111,7 @@ CREATE TABLE `spip_auteurs` ( LOCK TABLES `spip_auteurs` WRITE; /*!40000 ALTER TABLE `spip_auteurs` DISABLE KEYS */; -INSERT INTO `spip_auteurs` VALUES (1,'__DB_USER__','','__ADMIN_SPIP__@__DOMAIN__','','','__ADMIN_SPIP__','__DB_SHA__','','0minirezo','oui','2017-02-22 00:06:22','','__DB_PWD__','0000-00-00 00:00:00','__ALEA_ACTUEL__','__ALEA_FUTUR__',NULL,NULL,'spip','',NULL,NULL); +INSERT INTO `spip_auteurs` VALUES (1,'__ADMIN_SPIP__','','__ADMIN_SPIP__@__DOMAIN__','','','__ADMIN_SPIP__','__DB_SHA__','','0minirezo','oui','2017-02-22 00:06:22','','__DB_PWD__','0000-00-00 00:00:00','__ALEA_ACTUEL__','__ALEA_FUTUR__',NULL,NULL,'spip','',NULL,NULL); /*!40000 ALTER TABLE `spip_auteurs` ENABLE KEYS */; UNLOCK TABLES; From 0af43ec257525a4126c64231ed2a853811d326f1 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 02:39:06 +0100 Subject: [PATCH 39/97] Inclure le fichier .fonctions --- scripts/upgrade | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 55202b9..db8f0f7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -3,6 +3,8 @@ # Exit on command errors and treat unset variables as an error set -eu +source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script + # See comments in install script app=$YNH_APP_INSTANCE_NAME @@ -30,6 +32,8 @@ final_path=/var/www/$app db_name=$app +CHECK_MD5_CONFIG "connect.php" "$final_path/config/connect.php" # Créé un backup du fichier de config si il a été modifié. + # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf* sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* @@ -37,13 +41,6 @@ sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* if [ $is_public = "Yes" ]; then sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf - # grep -q "define('FORCE_SSL_ADMIN', true);" $final_path/config/connect.php - # if [[ ! $? -eq 0 ]]; - # then - # echo "define('FORCE_SSL_ADMIN', true);" | sudo tee -a $final_path/config/connect.php - # else - # sudo sed -i "s@//define('FORCE_SSL_ADMIN@define('FORCE_SSL_ADMIN@g" $final_path/config/connect.php - # fi else sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf fi From a7aa5c755dee20f70461c7c0a719baa11f666980 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 14:50:29 +0100 Subject: [PATCH 40/97] =?UTF-8?q?Mes=5Foptions=20pour=20=C3=A9viter=20les?= =?UTF-8?q?=20redirection=20302=20+=20conf=20nginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/mes_options.php | 3 ++ conf/nginx.conf | 71 +++++++++++++++++++++++++++++++------------- manifest.json | 1 + scripts/install | 1 + 4 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 conf/mes_options.php diff --git a/conf/mes_options.php b/conf/mes_options.php new file mode 100644 index 0000000..3b30597 --- /dev/null +++ b/conf/mes_options.php @@ -0,0 +1,3 @@ + Date: Wed, 22 Feb 2017 15:23:41 +0100 Subject: [PATCH 41/97] Installation incorrect erreur conf nginx --- conf/nginx.conf | 2 +- scripts/install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8dd7bf1..c9cd198 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -25,7 +25,7 @@ location __PATHTOCHANGE__ { expires 1w; add_header Cache-Control public; } - location /spip { + location / { # La configuration globale du site. Tout ce qui ne va dans # aucune autre location vas ici. diff --git a/scripts/install b/scripts/install index b3fd84a..5f0e42d 100644 --- a/scripts/install +++ b/scripts/install @@ -83,12 +83,12 @@ sudo sed -i "s@__DB_SHA__@$db_sha@g" ../conf/sql/spip.sql for i in 1 2 3 4 5 6 7 8 do - j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p') + j=$(cat /dev/urandom | tr -dc '0-9' | fold -w 32 | head -n 1) if [ "$j" = "" ]; then # For obscure reasons, the loop is too fast at execution sleep 1 - j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p') + j=$(cat /dev/urandom | tr -dc '0-9' | fold -w 32 | head -n 1) fi sudo sed -i "s/__ALEA_ACTUEL__/$j/g" ../conf/sql/spip.sql sudo sed -i "s/__ALEA_FUTUR__/$j/g" ../conf/sql/spip.sql From 42a4d40bd4732a9508ca14a76a3d65b37c95ea37 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 16:05:03 +0100 Subject: [PATCH 42/97] =?UTF-8?q?cat=20random=20est=20une=20mauvaise=20id?= =?UTF-8?q?=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 5f0e42d..b3fd84a 100644 --- a/scripts/install +++ b/scripts/install @@ -83,12 +83,12 @@ sudo sed -i "s@__DB_SHA__@$db_sha@g" ../conf/sql/spip.sql for i in 1 2 3 4 5 6 7 8 do - j=$(cat /dev/urandom | tr -dc '0-9' | fold -w 32 | head -n 1) + j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p') if [ "$j" = "" ]; then # For obscure reasons, the loop is too fast at execution sleep 1 - j=$(cat /dev/urandom | tr -dc '0-9' | fold -w 32 | head -n 1) + j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p') fi sudo sed -i "s/__ALEA_ACTUEL__/$j/g" ../conf/sql/spip.sql sudo sed -i "s/__ALEA_FUTUR__/$j/g" ../conf/sql/spip.sql From 2da18a91166c22e601be22ef644657bcf1329aa3 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 16:11:52 +0100 Subject: [PATCH 43/97] =?UTF-8?q?location=20/=20emp=C3=AAche=20le=20red?= =?UTF-8?q?=C3=A9marrage=20de=20nginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/nginx.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index c9cd198..01e9c59 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -25,19 +25,19 @@ location __PATHTOCHANGE__ { expires 1w; add_header Cache-Control public; } - location / { + #location / { # La configuration globale du site. Tout ce qui ne va dans # aucune autre location vas ici. # Quelques fichiers standards générés par spip et devant être # à des URL précises. - rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; - rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; - rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; - rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; + # rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; + # rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; + # rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; + # rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; - try_files $uri $uri/ /spip.php?q=$uri&$args; - } + # try_files $uri $uri/ /spip.php?q=$uri&$args; + #} location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock; From 83bca4ffc9d306b73fe8bffc8fd007139e76b34f Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 16:20:36 +0100 Subject: [PATCH 44/97] [test] Sans mot de passe dans spip_auteurs --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b3fd84a..d42af6f 100644 --- a/scripts/install +++ b/scripts/install @@ -77,9 +77,9 @@ db_sha=$(echo $db_pwd | openssl dgst -sha1 -hmac "key" | awk -F'= ' {'print $2'} # Changer les informations de la tables spip_auteurs sudo sed -i "s@__ADMIN_SPIP__@$admin_spip@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_USER__@$db_user@g" ../conf/sql/spip.sql -sudo sed -i "s@__DB_PWD__@$db_md5@g" ../conf/sql/spip.sql +sudo sed -i "s@__DB_PWD__@@g" ../conf/sql/spip.sql sudo sed -i "s@__DOMAIN__@$domain@g" ../conf/sql/spip.sql -sudo sed -i "s@__DB_SHA__@$db_sha@g" ../conf/sql/spip.sql +sudo sed -i "s@__DB_SHA__@@g" ../conf/sql/spip.sql for i in 1 2 3 4 5 6 7 8 do From 925f21d62b1e72c8b235e05eb5160e0868c3186a Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 16:25:39 +0100 Subject: [PATCH 45/97] Revert --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index d42af6f..b3fd84a 100644 --- a/scripts/install +++ b/scripts/install @@ -77,9 +77,9 @@ db_sha=$(echo $db_pwd | openssl dgst -sha1 -hmac "key" | awk -F'= ' {'print $2'} # Changer les informations de la tables spip_auteurs sudo sed -i "s@__ADMIN_SPIP__@$admin_spip@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_USER__@$db_user@g" ../conf/sql/spip.sql -sudo sed -i "s@__DB_PWD__@@g" ../conf/sql/spip.sql +sudo sed -i "s@__DB_PWD__@$db_md5@g" ../conf/sql/spip.sql sudo sed -i "s@__DOMAIN__@$domain@g" ../conf/sql/spip.sql -sudo sed -i "s@__DB_SHA__@@g" ../conf/sql/spip.sql +sudo sed -i "s@__DB_SHA__@$db_sha@g" ../conf/sql/spip.sql for i in 1 2 3 4 5 6 7 8 do From b32f8d35b7fc1bdf3f767e3e2432d78434871b2e Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 17:11:41 +0100 Subject: [PATCH 46/97] https pour le telechargement de SPIP --- sources/source_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/source_url b/sources/source_url index ffbcf67..2e3ead6 100644 --- a/sources/source_url +++ b/sources/source_url @@ -1 +1 @@ -http://files.spip.org/spip/stable/spip-3.1.zip \ No newline at end of file +https://files.spip.org/spip/stable/spip-3.1.zip \ No newline at end of file From 6e499d95b77413a1a9701b206db11e1fcc922076 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 17:15:45 +0100 Subject: [PATCH 47/97] Update version + README --- README.md | 5 +++++ manifest.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 190ac30..3ccf8b5 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,11 @@ ## Spip for YunoHost +### Version 1.1.3 (22/02/17) + +- Update scripts for passing package_linter +- Install database + ### Version 1.0.3 (20/10/16) - Update script - status test diff --git a/manifest.json b/manifest.json index f8219b2..7f7d309 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "SPIP - publishing system for the Internet", "fr": "SPIP - Système de publication pour l’Internet" }, - "version": "1.0.3", + "version": "1.1.3", "url": "http://www.spip.net/", "license": "free", "maintainer": { From b61b07d97a76924cbdd9bba2b21512dab82975cd Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 22 Feb 2017 20:05:34 +0100 Subject: [PATCH 48/97] Constantes dans mes_options --- conf/mes_options.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/mes_options.php b/conf/mes_options.php index 3b30597..4737c67 100644 --- a/conf/mes_options.php +++ b/conf/mes_options.php @@ -1,3 +1,5 @@ Date: Wed, 22 Feb 2017 21:23:43 +0100 Subject: [PATCH 49/97] rewrite dans la conf de nginx --- conf/nginx.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 01e9c59..5b88c3c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -25,19 +25,19 @@ location __PATHTOCHANGE__ { expires 1w; add_header Cache-Control public; } - #location / { + location /__NAMETOCHANGE__ { # La configuration globale du site. Tout ce qui ne va dans # aucune autre location vas ici. # Quelques fichiers standards générés par spip et devant être # à des URL précises. - # rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; - # rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; - # rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; - # rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; + rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; + rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; + rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; + rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; - # try_files $uri $uri/ /spip.php?q=$uri&$args; - #} + try_files $uri $uri/ /spip.php?q=$uri&$args; + } location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock; From d55178d4fe1bfbee9398cde15dd8145863385166 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 02:07:28 +0100 Subject: [PATCH 50/97] rewrite dans la conf de nginx --- conf/mes_options.php | 4 ++-- conf/nginx.conf | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/conf/mes_options.php b/conf/mes_options.php index 4737c67..517066e 100644 --- a/conf/mes_options.php +++ b/conf/mes_options.php @@ -1,5 +1,5 @@ Date: Thu, 23 Feb 2017 02:10:25 +0100 Subject: [PATCH 51/97] update source_md5 --- sources/source_md5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/source_md5 b/sources/source_md5 index 070d3e9..7650b0f 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -63e6b3ed8c0725b3befdb2867a070e81 spip-3.1.zip \ No newline at end of file +b1116848c462259c637ded7c7bd19274 spip-3.1.zip From 9535ff287074c7358a09551c7711feb2c74a1361 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 02:12:44 +0100 Subject: [PATCH 52/97] comment rewrite dans la conf de nginx --- conf/nginx.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0ca95b8..045afd5 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -36,19 +36,19 @@ location __PATHTOCHANGE__ { expires 1w; add_header Cache-Control public; } - location ~ ^/__NAMETOCHANGE__ { + #location ~ ^/__NAMETOCHANGE__ { # La configuration globale du site. Tout ce qui ne va dans # aucune autre location vas ici. # Quelques fichiers standards générés par spip et devant être # à des URL précises. - rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; - rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; - rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; - rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; + # rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; + # rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; + # rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; + # rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; - try_files $uri $uri/ /spip.php?q=$uri&$args; - } + # try_files $uri $uri/ /spip.php?q=$uri&$args; + #} location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock; From 93b3d67274fa8b5bd3938e452d0d581d2d538b26 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 02:19:06 +0100 Subject: [PATCH 53/97] Ne pas utiliser l'authentification Apache --- conf/mes_options.php | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/mes_options.php b/conf/mes_options.php index 517066e..e03eb8e 100644 --- a/conf/mes_options.php +++ b/conf/mes_options.php @@ -3,3 +3,4 @@ define('_SERVER_APACHE', 'false'); // define('_DIR_CONNECT', 'config'); // define('_DIR_TMP', 'tmp'); +$ignore_auth_http = true; From 0474b8e68a90a00c95ff1ce270be5979c7959cd9 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 03:08:41 +0100 Subject: [PATCH 54/97] Fix le choix de la langue --- conf/sql/spip.sql | 2 +- scripts/install | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql index 56f521c..6d76030 100644 --- a/conf/sql/spip.sql +++ b/conf/sql/spip.sql @@ -491,7 +491,7 @@ CREATE TABLE `spip_meta` ( LOCK TABLES `spip_meta` WRITE; /*!40000 ALTER TABLE `spip_meta` DISABLE KEYS */; -INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','fr','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','cyp@rouquin.me','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://debile.ddns.net/spip','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','fr','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); +INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','__LANG_SPIP__','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','cyp@rouquin.me','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://debile.ddns.net/spip','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','fr','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); /*!40000 ALTER TABLE `spip_meta` ENABLE KEYS */; UNLOCK TABLES; diff --git a/scripts/install b/scripts/install index b3fd84a..d0dc1a2 100644 --- a/scripts/install +++ b/scripts/install @@ -73,6 +73,7 @@ sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/connect.php db_md5=$(echo $db_pwd | md5sum | awk '{print $1}') db_sha=$(echo $db_pwd | openssl dgst -sha1 -hmac "key" | awk -F'= ' {'print $2'}) +language="$(echo $language | head -c 2)" # Changer les informations de la tables spip_auteurs sudo sed -i "s@__ADMIN_SPIP__@$admin_spip@g" ../conf/sql/spip.sql @@ -80,6 +81,7 @@ sudo sed -i "s@__DB_USER__@$db_user@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_PWD__@$db_md5@g" ../conf/sql/spip.sql sudo sed -i "s@__DOMAIN__@$domain@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_SHA__@$db_sha@g" ../conf/sql/spip.sql +sudo sed -i "s@__LANG_SPIP__@$language@g" ../conf/sql/spip.sql for i in 1 2 3 4 5 6 7 8 do From 8d09bf83366a99bcbb478606003586209a630003 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 03:13:27 +0100 Subject: [PATCH 55/97] Fix le choix de la langue --- conf/sql/spip.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql index 6d76030..34c550d 100644 --- a/conf/sql/spip.sql +++ b/conf/sql/spip.sql @@ -491,7 +491,7 @@ CREATE TABLE `spip_meta` ( LOCK TABLES `spip_meta` WRITE; /*!40000 ALTER TABLE `spip_meta` DISABLE KEYS */; -INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','__LANG_SPIP__','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','cyp@rouquin.me','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://debile.ddns.net/spip','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','fr','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); +INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','__LANG_SPIP__','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','cyp@rouquin.me','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://debile.ddns.net/spip','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','__LANG_SPIP__','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); /*!40000 ALTER TABLE `spip_meta` ENABLE KEYS */; UNLOCK TABLES; From 2088412e9406085766d4d678852c03d3ebd7fd73 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 03:19:10 +0100 Subject: [PATCH 56/97] Fix le choix de la langue --- conf/sql/spip.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql index 34c550d..f872810 100644 --- a/conf/sql/spip.sql +++ b/conf/sql/spip.sql @@ -111,7 +111,7 @@ CREATE TABLE `spip_auteurs` ( LOCK TABLES `spip_auteurs` WRITE; /*!40000 ALTER TABLE `spip_auteurs` DISABLE KEYS */; -INSERT INTO `spip_auteurs` VALUES (1,'__ADMIN_SPIP__','','__ADMIN_SPIP__@__DOMAIN__','','','__ADMIN_SPIP__','__DB_SHA__','','0minirezo','oui','2017-02-22 00:06:22','','__DB_PWD__','0000-00-00 00:00:00','__ALEA_ACTUEL__','__ALEA_FUTUR__',NULL,NULL,'spip','',NULL,NULL); +INSERT INTO `spip_auteurs` VALUES (1,'__ADMIN_SPIP__','','__ADMIN_SPIP__@__DOMAIN__','','','__ADMIN_SPIP__','__DB_SHA__','','0minirezo','oui','2017-02-22 00:06:22','','__DB_PWD__','0000-00-00 00:00:00','__ALEA_ACTUEL__','__ALEA_FUTUR__',NULL,NULL,'spip','__LANG_SPIP__',NULL,NULL); /*!40000 ALTER TABLE `spip_auteurs` ENABLE KEYS */; UNLOCK TABLES; From 1860935b19551a833a85ab156d7a9c7a4dbb1c23 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 13:45:03 +0100 Subject: [PATCH 57/97] =?UTF-8?q?Pr=C3=A9cision=20sur=20l'utilisateur=20da?= =?UTF-8?q?ns=20le=20manifest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 7f7d309..b2fbbdf 100644 --- a/manifest.json +++ b/manifest.json @@ -1,4 +1,4 @@ -{ + (must be an existing YunoHost user){ "name": "SPIP", "id": "spip", "packaging_format": 1, @@ -48,8 +48,8 @@ "name": "admin", "type": "user", "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l’administrateur" + "en": "Choose an admin user (must be an existing YunoHost user)", + "fr": "Choisissez l’administrateur (doit être un utilisateur YunoHost existant)" }, "example": "johndoe" }, From 4a9d396b890ff80f41e8d9729832a90bbc5a444d Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 13:45:48 +0100 Subject: [PATCH 58/97] ynh_app_setting_get et pas set --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 5177456..51e35a6 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,7 +10,7 @@ source /usr/share/yunohost/helpers # Récupère les infos de l'application. app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_set $app domain) +domain=$(ynh_app_setting_get $app domain) REMOVE_BDD $app # Suppression de la base de donnée et de l'utilisateur associé. From 0d66b967ec9bf73cc1e817001c6f9fcc66a731ad Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 13:53:48 +0100 Subject: [PATCH 59/97] Super coquille ligne 1 : erase --- manifest.json | 149 +++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/manifest.json b/manifest.json index b2fbbdf..612b151 100644 --- a/manifest.json +++ b/manifest.json @@ -1,76 +1,75 @@ - (must be an existing YunoHost user){ - "name": "SPIP", - "id": "spip", - "packaging_format": 1, - "description": { - "en": "SPIP - publishing system for the Internet", - "fr": "SPIP - Système de publication pour l’Internet" - }, - "version": "1.1.3", - "url": "http://www.spip.net/", - "license": "free", - "maintainer": { - "name": "cyp", - "email": "cyp@rouquin.me", - "url": "http://www.rouquin.me" - }, - "requirements": { - "yunohost": ">> 2.4.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "php5-fpm", - "mysql" - ], - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain", - "ask": { - "en": "Choose a domain name for SPIP", - "fr": "Choisissez un nom de domaine pour SPIP" - }, - "example": "example.org" - }, - { - "name": "path", - "type": "path", - "ask": { - "en": "Choose a path for SPIP", - "fr": "Choisissez un chemin pour SPIP" - }, - "example": "/spip", - "default": "/spip" - }, - { - "name": "admin", - "type": "user", - "ask": { - "en": "Choose an admin user (must be an existing YunoHost user)", - "fr": "Choisissez l’administrateur (doit être un utilisateur YunoHost existant)" - }, - "example": "johndoe" - }, - { - "name": "is_public", - "ask": { - "en": "Is it a public SPIP site ?", - "fr": "Est-ce un site public ?" - }, - "choices": ["Yes", "No"], - "default": "Yes" - }, - { - "name": "language", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["en_EN", "fr_FR"], - "default": "fr_FR" - } - ] - } + { + "name": "SPIP", + "id": "spip", + "packaging_format": 1, + "description": { + "en": "SPIP - publishing system for the Internet", + "fr": "SPIP - Système de publication pour l’Internet" + }, + "version": "1.1.3", + "url": "http://www.spip.net/", + "license": "free", + "maintainer": { + "name": "cyp", + "email": "cyp@rouquin.me", + }, + "requirements": { + "yunohost": ">> 2.4.0" + }, + "multi_instance": true, + "services": [ + "nginx", + "php5-fpm", + "mysql" + ], + "arguments": { + "install" : [ + { + "name": "domain", + "type": "domain", + "ask": { + "en": "Choose a domain name for SPIP", + "fr": "Choisissez un nom de domaine pour SPIP" + }, + "example": "example.org" + }, + { + "name": "path", + "type": "path", + "ask": { + "en": "Choose a path for SPIP", + "fr": "Choisissez un chemin pour SPIP" + }, + "example": "/spip", + "default": "/spip" + }, + { + "name": "admin", + "type": "user", + "ask": { + "en": "Choose the SPIP administrator (must be an existing YunoHost user)", + "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" + }, + "example": "johndoe" + }, + { + "name": "is_public", + "ask": { + "en": "Is it a public SPIP site ?", + "fr": "Est-ce un site public ?" + }, + "choices": ["Yes", "No"], + "default": "Yes" + }, + { + "name": "language", + "ask": { + "en": "Choose the application language", + "fr": "Choisissez la langue de l'application" + }, + "choices": ["en_EN", "fr_FR"], + "default": "fr_FR" + } + ] + } } \ No newline at end of file From a0bd33db3981b505cfa2e64a2f9e47207a49d2fb Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 13:58:50 +0100 Subject: [PATCH 60/97] Virgule en trop --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 612b151..758bbed 100644 --- a/manifest.json +++ b/manifest.json @@ -1,4 +1,4 @@ - { +{ "name": "SPIP", "id": "spip", "packaging_format": 1, @@ -11,7 +11,7 @@ "license": "free", "maintainer": { "name": "cyp", - "email": "cyp@rouquin.me", + "email": "cyp@rouquin.me" }, "requirements": { "yunohost": ">> 2.4.0" From fc2f083a0617f4f8b86d9037ceefb13f9a8a0b9c Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 15:04:08 +0100 Subject: [PATCH 61/97] =?UTF-8?q?Fix=20r=C3=A9sidu=20dans=20la=20fichier?= =?UTF-8?q?=20.sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/sql/spip.sql | 2 +- scripts/install | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql index f872810..c4cc9f0 100644 --- a/conf/sql/spip.sql +++ b/conf/sql/spip.sql @@ -491,7 +491,7 @@ CREATE TABLE `spip_meta` ( LOCK TABLES `spip_meta` WRITE; /*!40000 ALTER TABLE `spip_meta` DISABLE KEYS */; -INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','__LANG_SPIP__','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','cyp@rouquin.me','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://debile.ddns.net/spip','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','__LANG_SPIP__','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); +INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','__LANG_SPIP__','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','__ADMIN_SPIP__@__DOMAIN__','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://__DOMAIN__/__PATH__','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','__LANG_SPIP__','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); /*!40000 ALTER TABLE `spip_meta` ENABLE KEYS */; UNLOCK TABLES; diff --git a/scripts/install b/scripts/install index d0dc1a2..26aabdc 100644 --- a/scripts/install +++ b/scripts/install @@ -77,6 +77,7 @@ language="$(echo $language | head -c 2)" # Changer les informations de la tables spip_auteurs sudo sed -i "s@__ADMIN_SPIP__@$admin_spip@g" ../conf/sql/spip.sql +sudo sed -i "s@__PATH__@$path@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_USER__@$db_user@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_PWD__@$db_md5@g" ../conf/sql/spip.sql sudo sed -i "s@__DOMAIN__@$domain@g" ../conf/sql/spip.sql From eb6f771a71f556ce86da538758d74b8d7a6c8ce0 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 15:08:08 +0100 Subject: [PATCH 62/97] Fix slash en trop dans le fichier .sql --- conf/sql/spip.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/sql/spip.sql b/conf/sql/spip.sql index c4cc9f0..28969df 100644 --- a/conf/sql/spip.sql +++ b/conf/sql/spip.sql @@ -491,7 +491,7 @@ CREATE TABLE `spip_meta` ( LOCK TABLES `spip_meta` WRITE; /*!40000 ALTER TABLE `spip_meta` DISABLE KEYS */; -INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','__LANG_SPIP__','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','__ADMIN_SPIP__@__DOMAIN__','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://__DOMAIN__/__PATH__','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','__LANG_SPIP__','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); +INSERT INTO `spip_meta` VALUES ('charset_sql_base','utf8','non','2017-02-22 00:05:15'),('charset_collation_sql_base','utf8_general_ci','non','2017-02-22 00:05:15'),('charset_sql_connexion','utf8','non','2017-02-22 00:05:15'),('version_installee','21742','non','2017-02-22 00:05:15'),('nouvelle_install','1','non','2017-02-22 00:05:15'),('langue_site','__LANG_SPIP__','non','2017-02-22 00:06:22'),('pcre_u','u','oui','2017-02-22 00:05:56'),('charset','utf-8','oui','2017-02-22 00:05:56'),('alea_ephemere_ancien',NULL,'non','2017-02-22 00:06:22'),('alea_ephemere','1efd6d108a6f8c0654692bb7ad572cf4','non','2017-02-22 00:06:22'),('alea_ephemere_date','1487721956','non','2017-02-22 00:06:22'),('langues_proposees','ar,ast,ay,bg,br,bs,ca,co,cpf,cpf_hat,cs,da,de,en,eo,es,eu,fa,fon,fr,fr_fem,gl,he,hr,hu,id,it,it_fem,ja,km,lb,my,nl,oc_auv,oc_gsc,oc_lms,oc_lnc,oc_ni,oc_ni_la,oc_ni_mis,oc_prv,oc_va,pl,pt,pt_br,ro,ru,sk,sv,tr,uk,vi,zh','non','2017-02-22 00:06:22'),('email_webmaster','__ADMIN_SPIP__@__DOMAIN__','oui','2017-02-22 00:06:22'),('nom_site','Mon site SPIP','oui','2017-02-22 00:06:22'),('slogan_site','','oui','2017-02-22 00:06:22'),('adresse_site','https://__DOMAIN____PATH__','non','2017-02-22 00:06:27'),('descriptif_site','','oui','2017-02-22 00:06:22'),('activer_logos','oui','oui','2017-02-22 00:06:22'),('activer_logos_survol','non','oui','2017-02-22 00:06:22'),('articles_surtitre','non','oui','2017-02-22 00:06:22'),('articles_soustitre','non','oui','2017-02-22 00:06:22'),('articles_descriptif','non','oui','2017-02-22 00:06:22'),('articles_chapeau','non','oui','2017-02-22 00:06:22'),('articles_texte','oui','oui','2017-02-22 00:06:22'),('articles_ps','non','oui','2017-02-22 00:06:22'),('articles_redac','non','oui','2017-02-22 00:06:22'),('post_dates','non','oui','2017-02-22 00:06:22'),('articles_urlref','non','oui','2017-02-22 00:06:22'),('articles_redirection','non','oui','2017-02-22 00:06:22'),('creer_preview','non','non','2017-02-22 00:06:27'),('taille_preview','150','non','2017-02-22 00:06:27'),('articles_modif','non','oui','2017-02-22 00:06:22'),('rubriques_descriptif','non','oui','2017-02-22 00:06:22'),('rubriques_texte','oui','oui','2017-02-22 00:06:22'),('accepter_inscriptions','non','oui','2017-02-22 00:06:22'),('accepter_visiteurs','non','oui','2017-02-22 00:06:22'),('prevenir_auteurs','non','oui','2017-02-22 00:06:22'),('suivi_edito','non','oui','2017-02-22 00:06:22'),('adresse_suivi','','oui','2017-02-22 00:06:22'),('adresse_suivi_inscription','','oui','2017-02-22 00:06:22'),('adresse_neuf','','oui','2017-02-22 00:06:22'),('jours_neuf','','oui','2017-02-22 00:06:22'),('quoi_de_neuf','non','oui','2017-02-22 00:06:22'),('preview',',0minirezo,1comite,','oui','2017-02-22 00:06:22'),('syndication_integrale','oui','oui','2017-02-22 00:06:22'),('dir_img','IMG/','oui','2017-02-22 00:06:22'),('multi_rubriques','non','oui','2017-02-22 00:06:22'),('multi_secteurs','non','oui','2017-02-22 00:06:22'),('gerer_trad','non','oui','2017-02-22 00:06:22'),('langues_multilingue','','oui','2017-02-22 00:06:22'),('version_html_max','html4','oui','2017-02-22 00:06:22'),('type_urls','page','oui','2017-02-22 00:06:22'),('email_envoi','','oui','2017-02-22 00:06:22'),('auto_compress_http','non','oui','2017-02-22 00:06:22'),('mots_cles_forums','non','oui','2017-02-22 00:06:22'),('forums_titre','oui','oui','2017-02-22 00:06:22'),('forums_texte','oui','oui','2017-02-22 00:06:22'),('forums_urlref','non','oui','2017-02-22 00:06:22'),('forums_afficher_barre','oui','oui','2017-02-22 00:06:22'),('forums_forcer_previsu','oui','oui','2017-02-22 00:06:22'),('formats_documents_forum','','oui','2017-02-22 00:06:22'),('forums_publics','posteriori','oui','2017-02-22 00:06:22'),('forum_prive','oui','oui','2017-02-22 00:06:22'),('forum_prive_objets','oui','oui','2017-02-22 00:06:22'),('forum_prive_admin','non','oui','2017-02-22 00:06:22'),('articles_mots','non','oui','2017-02-22 00:06:22'),('config_precise_groupes','non','oui','2017-02-22 00:06:22'),('messagerie_agenda','oui','oui','2017-02-22 00:06:22'),('barre_outils_public','oui','oui','2017-02-22 00:06:22'),('objets_versions','a:0:{}','oui','2017-02-22 00:06:29'),('activer_sites','non','oui','2017-02-22 00:06:22'),('proposer_sites','0','oui','2017-02-22 00:06:22'),('activer_syndic','oui','oui','2017-02-22 00:06:22'),('moderation_sites','non','oui','2017-02-22 00:06:22'),('activer_statistiques','non','oui','2017-02-22 00:06:22'),('activer_captures_referers','non','oui','2017-02-22 00:06:22'),('activer_referers','oui','oui','2017-02-22 00:06:22'),('activer_breves','non','oui','2017-02-22 00:06:22'),('auto_compress_js','non','oui','2017-02-22 00:06:22'),('auto_compress_closure','non','oui','2017-02-22 00:06:22'),('auto_compress_css','non','oui','2017-02-22 00:06:22'),('url_statique_ressources','','oui','2017-02-22 00:06:22'),('documents_objets','spip_articles','oui','2017-02-22 00:06:22'),('documents_date','non','oui','2017-02-22 00:06:22'),('langues_utilisees','__LANG_SPIP__','oui','2017-02-22 00:06:23'),('plugin','a:28:{s:4:\"SPIP\";a:5:{s:3:\"nom\";s:4:\"SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"3.1.3\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:0:\"\";}s:9:\"COMPAGNON\";a:5:{s:3:\"nom\";s:9:\"Compagnon\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.2\";s:3:\"dir\";s:9:\"compagnon\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"DUMP\";a:5:{s:3:\"nom\";s:4:\"Dump\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.7.5\";s:3:\"dir\";s:4:\"dump\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"IMAGES\";a:5:{s:3:\"nom\";s:6:\"Images\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.1\";s:3:\"dir\";s:14:\"filtres_images\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"FORUM\";a:5:{s:3:\"nom\";s:5:\"Forum\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.35\";s:3:\"dir\";s:5:\"forum\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"JQUERYUI\";a:5:{s:3:\"nom\";s:9:\"jQuery UI\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.11.4\";s:3:\"dir\";s:9:\"jquery_ui\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"MEDIABOX\";a:5:{s:3:\"nom\";s:8:\"MediaBox\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.2\";s:3:\"dir\";s:8:\"mediabox\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"MOTS\";a:5:{s:3:\"nom\";s:4:\"Mots\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.7.8\";s:3:\"dir\";s:4:\"mots\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ORGANISEUR\";a:5:{s:3:\"nom\";s:10:\"Organiseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.3\";s:3:\"dir\";s:10:\"organiseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"PETITIONS\";a:5:{s:3:\"nom\";s:10:\"Pétitions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.4\";s:3:\"dir\";s:9:\"petitions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"PLAN\";a:5:{s:3:\"nom\";s:35:\"Plan du site dans l’espace privé\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"2.1.1\";s:3:\"dir\";s:4:\"plan\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"PORTE_PLUME\";a:5:{s:3:\"nom\";s:11:\"Porte plume\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"1.15.14\";s:3:\"dir\";s:11:\"porte_plume\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"REVISIONS\";a:5:{s:3:\"nom\";s:10:\"Révisions\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.8.7\";s:3:\"dir\";s:9:\"revisions\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:8:\"SAFEHTML\";a:5:{s:3:\"nom\";s:8:\"SafeHTML\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.4.3\";s:3:\"dir\";s:8:\"safehtml\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"SITES\";a:5:{s:3:\"nom\";s:5:\"Sites\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.9.24\";s:3:\"dir\";s:5:\"sites\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:23:\"SQUELETTES_PAR_RUBRIQUE\";a:5:{s:3:\"nom\";s:23:\"Squelettes par Rubrique\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.1.2\";s:3:\"dir\";s:23:\"squelettes_par_rubrique\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:5:\"STATS\";a:5:{s:3:\"nom\";s:12:\"Statistiques\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.5\";s:3:\"dir\";s:12:\"statistiques\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:3:\"SVP\";a:5:{s:3:\"nom\";s:3:\"SVP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.0.7\";s:3:\"dir\";s:3:\"svp\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:2:\"TW\";a:5:{s:3:\"nom\";s:19:\"TextWheel pour SPIP\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.15\";s:3:\"dir\";s:9:\"textwheel\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:4:\"URLS\";a:5:{s:3:\"nom\";s:13:\"Urls Etendues\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.5.9\";s:3:\"dir\";s:13:\"urls_etendues\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:9:\"VERTEBRES\";a:5:{s:3:\"nom\";s:10:\"Vertèbres\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:5:\"1.2.6\";s:3:\"dir\";s:9:\"vertebres\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:10:\"ITERATEURS\";a:5:{s:3:\"nom\";s:10:\"iterateurs\";s:7:\"version\";s:5:\"1.0.6\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:18:\"procure:iterateurs\";}s:5:\"QUEUE\";a:5:{s:3:\"nom\";s:5:\"queue\";s:7:\"version\";s:5:\"0.6.8\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:13:\"procure:queue\";}s:6:\"JQUERY\";a:5:{s:3:\"nom\";s:6:\"jquery\";s:7:\"version\";s:6:\"1.12.4\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:14:\"procure:jquery\";}s:3:\"PHP\";a:5:{s:3:\"nom\";s:3:\"php\";s:7:\"version\";s:15:\"5.6.29-0+deb8u1\";s:4:\"etat\";s:1:\"?\";s:8:\"dir_type\";s:14:\"_DIR_RESTREINT\";s:3:\"dir\";s:11:\"procure:php\";}s:6:\"BREVES\";a:5:{s:3:\"nom\";s:7:\"Brèves\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.3.14\";s:3:\"dir\";s:6:\"breves\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:11:\"COMPRESSEUR\";a:5:{s:3:\"nom\";s:11:\"Compresseur\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:6:\"1.10.4\";s:3:\"dir\";s:11:\"compresseur\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}s:6:\"MEDIAS\";a:5:{s:3:\"nom\";s:6:\"Medias\";s:4:\"etat\";s:6:\"stable\";s:7:\"version\";s:7:\"2.10.35\";s:3:\"dir\";s:6:\"medias\";s:8:\"dir_type\";s:17:\"_DIR_PLUGINS_DIST\";}}','non','2017-02-22 00:06:27'),('plugin_attente','a:0:{}','oui','2017-02-22 00:06:24'),('plugin_header','spip(3.1.3),compagnon(1.5.2),dump(1.7.5),images(1.2.1),forum(1.9.35),jqueryui(1.11.4),mediabox(1.0.2),mots(2.7.8),organiseur(1.0.3),petitions(1.5.4),plan(2.1.1),porte_plume(1.15.14),revisions(1.8.7),safehtml(1.4.3),sites(1.9.24),squelettes_par_rubrique(1.1.2),stats(1.0.5),svp(1.0.7),tw(1.3.15),urls(1.5.9),vertebres(1.2.6),iterateurs(1.0.6),queue(0.6.8),jquery(1.12.4),php(5.6.29-0+deb8u1),breves(1.3.14),compresseur(1.10.4),medias(2.10.35)','non','2017-02-22 00:06:27'),('compagnon','a:1:{s:6:\"config\";a:1:{s:7:\"activer\";s:3:\"oui\";}}','oui','2017-02-22 00:06:27'),('compagnon_base_version','1.0.0','oui','2017-02-22 00:06:27'),('forum_base_version','1.2.2','oui','2017-02-22 00:06:28'),('mots_base_version','2.1.1','oui','2017-02-22 00:06:28'),('organiseur_base_version','1.1.2','oui','2017-02-22 00:06:28'),('petitions_base_version','1.1.6','oui','2017-02-22 00:06:28'),('revisions_base_version','1.2.0','oui','2017-02-22 00:06:29'),('sites_base_version','1.1.1','oui','2017-02-22 00:06:29'),('stats_base_version','1.0.1','oui','2017-02-22 00:06:29'),('svp_base_version','0.5.1','oui','2017-02-22 00:06:29'),('urls_base_version','1.1.4','oui','2017-02-22 00:06:29'),('breves_base_version','1.0.0','oui','2017-02-22 00:06:29'),('medias_base_version','1.2.7','oui','2017-02-22 00:06:30'),('plugin_installes','a:12:{i:0;s:9:\"compagnon\";i:1;s:5:\"forum\";i:2;s:4:\"mots\";i:3;s:10:\"organiseur\";i:4;s:9:\"petitions\";i:5;s:9:\"revisions\";i:6;s:5:\"sites\";i:7;s:12:\"statistiques\";i:8;s:3:\"svp\";i:9;s:13:\"urls_etendues\";i:10;s:6:\"breves\";i:11;s:6:\"medias\";}','oui','2017-02-22 00:06:30'); /*!40000 ALTER TABLE `spip_meta` ENABLE KEYS */; UNLOCK TABLES; From d873ab230f88b1d8a330f348d833b116c6659289 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 23 Feb 2017 23:52:18 +0100 Subject: [PATCH 63/97] ajou des rewrite dans la conf nginx --- conf/nginx.conf | 20 +++++--------------- scripts/install | 5 +++++ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 045afd5..2b82a91 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,6 +9,9 @@ location __PATHTOCHANGE__ { if (!-e $request_filename) { + rewrite ^/([^/]*)/robots\.txt$ __PATHTOCHANGE__/spip.php?page=robots.txt last; + rewrite ^/([^/]*)/favicon\.ico$ __PATHTOCHANGE__/spip.php?page=favicon.ico last; + rewrite ^/([^/]*)/sitemap\.xml$ __PATHTOCHANGE__/spip.php?page=sitemap.xml last; rewrite ^(.+)$ __PATHTOCHANGE__/index.php?q=$1 last; } if ($scheme = http) { @@ -25,8 +28,8 @@ location __PATHTOCHANGE__ { add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; - location ~^/(tmp|config)/{ - return 403; + location ~^/(tmp|config|\.ht)/{ + deny all; } location ~* \.(jpg|jpeg|gif|css|png|js|ico|swf|mp3|pdf)$ { # Le contenu statique, est signalé au navigateur comme étant @@ -36,19 +39,6 @@ location __PATHTOCHANGE__ { expires 1w; add_header Cache-Control public; } - #location ~ ^/__NAMETOCHANGE__ { - # La configuration globale du site. Tout ce qui ne va dans - # aucune autre location vas ici. - - # Quelques fichiers standards générés par spip et devant être - # à des URL précises. - # rewrite ^/([^/]*)/robots\.txt$ /spip.php?page=robots.txt last; - # rewrite ^/([^/]*)/favicon\.ico$ /spip.php?page=favicon.ico last; - # rewrite ^/([^/]*)/sitemap\.xml$ /spip.php?page=sitemap.xml last; - # rewrite ^/([^/]*)/mobile\.html$ /spip.php?page=mobile_uk last; - - # try_files $uri $uri/ /spip.php?q=$uri&$args; - #} location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock; diff --git a/scripts/install b/scripts/install index 26aabdc..9a0f7ca 100644 --- a/scripts/install +++ b/scripts/install @@ -62,6 +62,11 @@ sudo sed -i "s@__PATHTOCHANGE__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf sudo sed -i "s@__FINALPATH__@$final_path@g" /etc/nginx/conf.d/$domain.d/$app.conf sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf +if [ "$is_public" = "Yes" ]; +then + sudo sed -i "s@#--PRIVATE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf +fi + POOL_FPM sudo cp ../conf/connect.php $final_path/config/connect.php From 782db06927c70821dfe6bc57e8da464da97303c5 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 24 Feb 2017 00:41:21 +0100 Subject: [PATCH 64/97] update source_md5 --- sources/source_md5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/source_md5 b/sources/source_md5 index 7650b0f..3d54382 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -b1116848c462259c637ded7c7bd19274 spip-3.1.zip +d088d0d39cdfa3d2b43e2ae99ef291a4 spip-3.1.zip From 26ec6971ab960f0d6e1da4ad07d3a382fab52020 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 24 Feb 2017 00:57:14 +0100 Subject: [PATCH 65/97] Fix le favico dans la conf de nginx --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2b82a91..6c5ec74 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,6 @@ location __PATHTOCHANGE__ { if (!-e $request_filename) { rewrite ^/([^/]*)/robots\.txt$ __PATHTOCHANGE__/spip.php?page=robots.txt last; - rewrite ^/([^/]*)/favicon\.ico$ __PATHTOCHANGE__/spip.php?page=favicon.ico last; rewrite ^/([^/]*)/sitemap\.xml$ __PATHTOCHANGE__/spip.php?page=sitemap.xml last; rewrite ^(.+)$ __PATHTOCHANGE__/index.php?q=$1 last; } @@ -36,6 +35,7 @@ location __PATHTOCHANGE__ { # à garder en cache une semaine. Si il y a un proxy sur la # route, celui-ci est autorisé à faire une copie et à la # cacher. + rewrite ^/([^/]*)/favicon\.ico$ __PATHTOCHANGE__/spip.php?page=favicon.ico last; expires 1w; add_header Cache-Control public; } From 9e727f0abd963cece5d2ceb5da68d42817434005 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 24 Feb 2017 02:26:54 +0100 Subject: [PATCH 66/97] Ajout du contenu dans le README --- README.md | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3ccf8b5..bb9f7a5 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,52 @@ # SPIP_ynh -## Spip for YunoHost +## Spip c'est quoi ? + +[fr] SPIP est un système de publication pour l’Internet qui s’attache particulièrement au fonctionnement collectif, au multilinguisme et à la facilité d’emploi. C’est un logiciel libre, distribué sous la licence GNU/GPL. Il peut ainsi être utilisé pour tout site Internet, qu’il soit associatif ou institutionnel, personnel ou marchand. + +## Fonctionnalité de l'application pour Yunohost + +- Installation de la base sans passer par le système d'installation +- Support multilingue + +### Installation + +`$ sudo yunohost app install https://github.com/YunoHost-Apps/spip_ynh.git` + +### Mise à jour + +`$ sudo yunohost app upgrade --verbose spip -u https://github.com/YunoHost-Apps/spip_ynh.git` + +### Utilisation + +Accéder à l'administration du site en écrivant l'adresse suivante dans votre navigateur. + +https://www.domain.tld/spip/ecrire + +Faire une demande de "mot de passe oublié" pour changer votre mot de passe, vous recevez un email vous indiquant comment procéder au changement de mot de passe. + +## What is Spip? + +[en] SPIP is a publishing system for the Internet in which great importance is attached to collaborative working, to multilingual environments, and to simplicity of use for web authors. It is free software, distributed under the GNU/GPL licence. This means that it can be used for any Internet site, whether personal or institutional, non-profit or commercial. + +### Use + +Access the site administration by writing the following address in your browser. + +https: //www.domain.tld/spip/ecrire + +Request a "forgotten password" to change your password, you will receive an email telling you how to change your password. + +## Features for Yunohost app + +- Database install without going through the system install +- Multilanguage support ### Version 1.1.3 (22/02/17) - Update scripts for passing package_linter - Install database +- Multilanguage ### Version 1.0.3 (20/10/16) @@ -24,8 +65,3 @@ ###Version 1.0.0 (28/12/15) - Create script install - -## Configuration - -1. Start url https://domaine.tld/spip/ecrire -2. Check SQL password /etc/yunohost/apps/spip/settings.yml From 77d6a5843cffaabe125e313aab17d6edcb075052 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 24 Feb 2017 02:27:58 +0100 Subject: [PATCH 67/97] Ajout du contenu dans le README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bb9f7a5..dd15273 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,8 @@ Request a "forgotten password" to change your password, you will receive an emai - Database install without going through the system install - Multilanguage support +## Versionning + ### Version 1.1.3 (22/02/17) - Update scripts for passing package_linter From 64fddfc60a3bfd181e93482ef725e67160a50c1c Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 24 Feb 2017 02:28:47 +0100 Subject: [PATCH 68/97] Ajout du contenu dans le README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dd15273..72eec0d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Spip c'est quoi ? -[fr] SPIP est un système de publication pour l’Internet qui s’attache particulièrement au fonctionnement collectif, au multilinguisme et à la facilité d’emploi. C’est un logiciel libre, distribué sous la licence GNU/GPL. Il peut ainsi être utilisé pour tout site Internet, qu’il soit associatif ou institutionnel, personnel ou marchand. +SPIP est un système de publication pour l’Internet qui s’attache particulièrement au fonctionnement collectif, au multilinguisme et à la facilité d’emploi. C’est un logiciel libre, distribué sous la licence GNU/GPL. Il peut ainsi être utilisé pour tout site Internet, qu’il soit associatif ou institutionnel, personnel ou marchand. ## Fonctionnalité de l'application pour Yunohost @@ -27,7 +27,7 @@ Faire une demande de "mot de passe oublié" pour changer votre mot de passe, vou ## What is Spip? -[en] SPIP is a publishing system for the Internet in which great importance is attached to collaborative working, to multilingual environments, and to simplicity of use for web authors. It is free software, distributed under the GNU/GPL licence. This means that it can be used for any Internet site, whether personal or institutional, non-profit or commercial. +SPIP is a publishing system for the Internet in which great importance is attached to collaborative working, to multilingual environments, and to simplicity of use for web authors. It is free software, distributed under the GNU/GPL licence. This means that it can be used for any Internet site, whether personal or institutional, non-profit or commercial. ### Use From 7773dfdae245f1a4f15d9043893b611e4e883e1f Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 24 Feb 2017 02:30:31 +0100 Subject: [PATCH 69/97] Ajout du contenu dans le README --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 72eec0d..21aff23 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ SPIP est un système de publication pour l’Internet qui s’attache particulièrement au fonctionnement collectif, au multilinguisme et à la facilité d’emploi. C’est un logiciel libre, distribué sous la licence GNU/GPL. Il peut ainsi être utilisé pour tout site Internet, qu’il soit associatif ou institutionnel, personnel ou marchand. +Source: [spip.net](http://www.spip.net/fr_rubrique91.html) + ## Fonctionnalité de l'application pour Yunohost - Installation de la base sans passer par le système d'installation @@ -29,11 +31,13 @@ Faire une demande de "mot de passe oublié" pour changer votre mot de passe, vou SPIP is a publishing system for the Internet in which great importance is attached to collaborative working, to multilingual environments, and to simplicity of use for web authors. It is free software, distributed under the GNU/GPL licence. This means that it can be used for any Internet site, whether personal or institutional, non-profit or commercial. +Source: [spip.net](http://www.spip.net/en_rubrique25.html) + ### Use Access the site administration by writing the following address in your browser. -https: //www.domain.tld/spip/ecrire +https://www.domain.tld/spip/ecrire Request a "forgotten password" to change your password, you will receive an email telling you how to change your password. From dec2e6c119ac933ccd857264756bb998761157b5 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 24 Feb 2017 02:31:59 +0100 Subject: [PATCH 70/97] Ajout du contenu dans le README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21aff23..f0af581 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SPIP_ynh +# SPIP for YunoHost ## Spip c'est quoi ? From 018671d9915bc7e5527bc674f1fdffc16f29bbeb Mon Sep 17 00:00:00 2001 From: magikcypress Date: Sat, 25 Feb 2017 22:27:52 +0100 Subject: [PATCH 71/97] Nouveau md5 --- sources/source_md5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/source_md5 b/sources/source_md5 index 3d54382..2d48e15 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -d088d0d39cdfa3d2b43e2ae99ef291a4 spip-3.1.zip +edac8a9f725dad7083e5814938bba8cd spip-3.1.zip From 0829504a7d5aa58a280bbda8d1bb4be99465a019 Mon Sep 17 00:00:00 2001 From: Olivier Duquesne Date: Tue, 28 Feb 2017 20:05:53 +0100 Subject: [PATCH 72/97] Update source_md5 --- sources/source_md5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/source_md5 b/sources/source_md5 index 2d48e15..f4d3c5b 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -edac8a9f725dad7083e5814938bba8cd spip-3.1.zip +77d19d18b7afd804ac382f9e790e6a30 spip-3.1.zip From c52267e174357668d8d643bf53fc8903e77a8af3 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 3 Mar 2017 01:03:45 +0100 Subject: [PATCH 73/97] Change md5 --- sources/source_md5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/source_md5 b/sources/source_md5 index f4d3c5b..2ad97b6 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -77d19d18b7afd804ac382f9e790e6a30 spip-3.1.zip +acc291ee449c6c86eb9276ec1f59f476 spip-3.1.zip From f58d349765ff2b67204ac8dfc120d7aa6ece85ad Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 3 Mar 2017 01:13:50 +0100 Subject: [PATCH 74/97] Supprimer verif md5 pour le moment --- scripts/.fonctions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 14ec502..8bc9e7e 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -83,7 +83,7 @@ SETUP_SOURCE () { # Télécharge la source, décompresse et copie dans $final_pa # $1 = Nom de l'archive téléchargée. wget -nv --show-progress -i ../sources/source_url -O $1 # Vérifie la somme de contrôle de la source téléchargée. - md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" >&2 && false) + md5sum -c ../sources/source_md5 --status # Décompresse la source if [ "$(echo ${1##*.})" == "gz" ]; then tar -x -f $1 @@ -202,4 +202,4 @@ REMOVE_BDD () { # Suppression de la base de donnée et de l'utilisateur associé ynh_mysql_drop_db $db_user ynh_mysql_drop_user $db_user fi -} \ No newline at end of file +} From 4d3c32d1e20a3d786e58a8242036f8e016a0a6dc Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 3 Mar 2017 02:14:09 +0100 Subject: [PATCH 75/97] modification du check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 359db85..ac257c4 100644 --- a/check_process +++ b/check_process @@ -53,8 +53,8 @@ Level 1=auto Level 2=auto Level 3=auto - Level 4=1 - Level 5=1 + Level 4=0 + Level 5=auto Level 6=auto Level 7=auto Level 8=0 From dc578361b7dab650c2ef9fcbc05da66c28f733c4 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Sun, 5 Mar 2017 19:42:06 +0100 Subject: [PATCH 76/97] Ajout l'utilisation de LDAP --- README.md | 6 ++++++ check_process | 2 +- conf/connect.php | 2 +- conf/ldap.php | 7 +++++++ manifest.json | 11 ++++++++++- scripts/install | 40 +++++++++++++++++++++++++--------------- sources/source_md5 | 2 +- 7 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 conf/ldap.php diff --git a/README.md b/README.md index f0af581..4222a78 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Source: [spip.net](http://www.spip.net/fr_rubrique91.html) - Installation de la base sans passer par le système d'installation - Support multilingue +- Support LDAP ### Installation @@ -45,9 +46,14 @@ Request a "forgotten password" to change your password, you will receive an emai - Database install without going through the system install - Multilanguage support +- LDAP support ## Versionning +### Version 1.1.4 (05/03/17) + +- Support LDAP + ### Version 1.1.3 (22/02/17) - Update scripts for passing package_linter diff --git a/check_process b/check_process index ac257c4..c6c6846 100644 --- a/check_process +++ b/check_process @@ -53,7 +53,7 @@ Level 1=auto Level 2=auto Level 3=auto - Level 4=0 + Level 4=1 Level 5=auto Level 6=auto Level 7=auto diff --git a/conf/connect.php b/conf/connect.php index c376802..3a17b4b 100644 --- a/conf/connect.php +++ b/conf/connect.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/conf/ldap.php b/conf/ldap.php new file mode 100644 index 0000000..da5552a --- /dev/null +++ b/conf/ldap.php @@ -0,0 +1,7 @@ + array('sAMAccountName','uid','login','userid','cn','sn'),'nom' => 'cn','email' => 'mail','bio' => 'description',); diff --git a/manifest.json b/manifest.json index 758bbed..ae81996 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "SPIP - publishing system for the Internet", "fr": "SPIP - Système de publication pour l’Internet" }, - "version": "1.1.3", + "version": "1.1.4", "url": "http://www.spip.net/", "license": "free", "maintainer": { @@ -69,6 +69,15 @@ }, "choices": ["en_EN", "fr_FR"], "default": "fr_FR" + }, + { + "name": "ldap", + "ask": { + "en": "LDAP Connection", + "fr": "Connexion LDAP" + }, + "choices": ["Yes", "No"], + "default": "No" } ] } diff --git a/scripts/install b/scripts/install index 9a0f7ca..3bc3c3e 100644 --- a/scripts/install +++ b/scripts/install @@ -18,6 +18,7 @@ admin_spip=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE #multisite=$YNH_APP_ARG_MULTISITE is_public=$YNH_APP_ARG_IS_PUBLIC +ldap=$YNH_APP_ARG_LDAP app=$YNH_APP_INSTANCE_NAME @@ -39,6 +40,7 @@ ynh_app_setting_set $app path $path ynh_app_setting_set $app admin $admin_spip ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app language $language +ynh_app_setting_set $app ldap $ldap #ynh_app_setting_set $app multisite $multisite GENERATE_DB $app # Créer une base de données et un utilisateur dédié au nom de l'app. @@ -49,7 +51,7 @@ ynh_app_setting_set $app final_path $final_path SETUP_SOURCE "spip-3.1.zip" -# Set permissions to spip directory +# Set permissions du répertoire spip sudo chown -R www-data: $final_path echo -e "127.0.0.1 $domain #SPIP" | sudo tee -a /etc/hosts @@ -70,12 +72,12 @@ fi POOL_FPM sudo cp ../conf/connect.php $final_path/config/connect.php -sudo cp ../conf/mes_options.php $final_path/config/mes_options.php +sudo cp ../conf/mes_options.php $final_path/config/mes_options.php + +# Changer les variables du fichier de configuration de SPIP +sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php +sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php -# Changer les variables du ficher de configuration de SPIP -sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/config/connect.php -sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/config/connect.php - db_md5=$(echo $db_pwd | md5sum | awk '{print $1}') db_sha=$(echo $db_pwd | openssl dgst -sha1 -hmac "key" | awk -F'= ' {'print $2'}) language="$(echo $language | head -c 2)" @@ -105,8 +107,23 @@ done # Charger la structure des tables dans la base. mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/spip.sql -# Donne un accès public pour curl -ynh_app_setting_set $app unprotected_uris "/" +# Utilisation de LDAP pour SPIP +if [ "$ldap" = "Yes" ]; +then + sudo cp ../conf/ldap.php $final_path/config/ldap.php + sudo sed -i "s/__LDAP__/ldap/g" $final_path/config/connect.php + sudo mysql -e "INSERT INTO spip_meta (nom, valeur, impt) VALUES ('ldap_statut_import', '1comite', 'oui');" -u $db_user -p$db_pwd $db_user + +else + sudo sed -i "s@__LDAP__@@g" $final_path/config/connect.php +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 # Régénère la configuration de SSOwat sudo yunohost app ssowatconf @@ -115,12 +132,5 @@ sudo yunohost app ssowatconf sudo service php5-fpm restart sudo service nginx reload -if [ "$is_public" = "No" ]; -then - # Retire l'accès public - ynh_app_setting_delete $app unprotected_uris - sudo yunohost app ssowatconf -fi - # Nettoyer hosts sudo sed -i '/#SPIP/d' /etc/hosts \ No newline at end of file diff --git a/sources/source_md5 b/sources/source_md5 index 2ad97b6..dc9909e 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -acc291ee449c6c86eb9276ec1f59f476 spip-3.1.zip +2369689c6b387c417ea42506a9ea68b1 spip-3.1.zip From 49b65add29a518e27616251b41e9224d454fb461 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Mon, 6 Mar 2017 15:28:13 +0100 Subject: [PATCH 77/97] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20sources=20de?= =?UTF-8?q?=20SPIP=20(faille=20s=C3=A9cu)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/source_md5 | 2 +- sources/source_url | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/source_md5 b/sources/source_md5 index dc9909e..69295c5 100644 --- a/sources/source_md5 +++ b/sources/source_md5 @@ -1 +1 @@ -2369689c6b387c417ea42506a9ea68b1 spip-3.1.zip +ef284a7b78591cd04f7e37382881d636 SPIP-v3.1.4.zip \ No newline at end of file diff --git a/sources/source_url b/sources/source_url index 2e3ead6..dd1c390 100644 --- a/sources/source_url +++ b/sources/source_url @@ -1 +1 @@ -https://files.spip.org/spip/stable/spip-3.1.zip \ No newline at end of file +http://files.spip.net/spip/archives/SPIP-v3.1.4.zip \ No newline at end of file From c050d95c615b80cc685cfbae59665edf23369bbb Mon Sep 17 00:00:00 2001 From: magikcypress Date: Mon, 6 Mar 2017 18:15:45 +0100 Subject: [PATCH 78/97] =?UTF-8?q?V=C3=A9rifier=20CLEAN=5FSETUP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/.fonctions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 8bc9e7e..c09f788 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -17,7 +17,9 @@ EXIT_PROPERLY () { # Provoque l'arrêt du script en cas d'erreur. Et nettoye les echo -e "\e[91m \e[1m" # Shell in light red bold echo -e "!!\n $app install's script has encountered an error. Installation was cancelled.\n!!" >&2 - CLEAN_SETUP # Appel la fonction de nettoyage spécifique du script install. + if type -t CLEAN_SETUP > /dev/null; then # Vérifie l'existance de la fonction avant de l'exécuter. + CLEAN_SETUP # Appel la fonction de nettoyage spécifique du script install. + fi # Compense le bug de ssowat qui ne supprime pas l'entrée de l'app en cas d'erreur d'installation. sudo sed -i "\@\"$domain$path/\":@d" /etc/ssowat/conf.json From 4edbb03bedc091c69d3e9dda2cb05da17e913e04 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 7 Mar 2017 23:58:48 +0100 Subject: [PATCH 79/97] =?UTF-8?q?Placer=20les=20fichiers=20sources=20au=20?= =?UTF-8?q?m=C3=AAme=20endroit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 3bc3c3e..f1f0266 100644 --- a/scripts/install +++ b/scripts/install @@ -4,6 +4,8 @@ set -eu source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script +# Source app helpers +source /usr/share/yunohost/helpers CLEAN_SETUP () { # Nettoyage des résidus d'installation non pris en charge par le script remove. @@ -22,9 +24,6 @@ ldap=$YNH_APP_ARG_LDAP app=$YNH_APP_INSTANCE_NAME -# Source app helpers -source /usr/share/yunohost/helpers - CHECK_VAR "$app" "app name not set" CHECK_USER "$admin_spip" From f7f7d168ec8fedc22672c2921444a8900afd7ba1 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 8 Mar 2017 00:26:58 +0100 Subject: [PATCH 80/97] Commentaire en Anglais --- scripts/.fonctions | 109 ++++++++++++++++++++++----------------------- scripts/install | 31 +++++++------ scripts/remove | 18 ++++---- scripts/restore | 3 -- scripts/upgrade | 6 +-- 5 files changed, 79 insertions(+), 88 deletions(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index c09f788..2d47932 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -2,30 +2,30 @@ ynh_version="2.4" -YNH_VERSION () { # Renvoi le numéro de version de la moulinette Yunohost +YNH_VERSION () { # Returns the version number of the Yunohost moulinette ynh_version=$(sudo yunohost -v | grep "moulinette:" | cut -d' ' -f2 | cut -d'.' -f1,2) } -CHECK_VAR () { # Vérifie que la variable n'est pas vide. -# $1 = Variable à vérifier -# $2 = Texte à afficher en cas d'erreur +CHECK_VAR () { # Verifies that the variable is not empty. + # $1 = Variable to be checked + # $2 = Display text on error test -n "$1" || (echo "$2" >&2 && false) } -EXIT_PROPERLY () { # Provoque l'arrêt du script en cas d'erreur. Et nettoye les résidus. +EXIT_PROPERLY () { # Causes the script to stop in the event of an error. And clean the residue. trap '' ERR echo -e "\e[91m \e[1m" # Shell in light red bold echo -e "!!\n $app install's script has encountered an error. Installation was cancelled.\n!!" >&2 - if type -t CLEAN_SETUP > /dev/null; then # Vérifie l'existance de la fonction avant de l'exécuter. - CLEAN_SETUP # Appel la fonction de nettoyage spécifique du script install. + if type -t CLEAN_SETUP > /dev/null; then # Checks the existence of the function before executing it. + CLEAN_SETUP # Call the specific cleanup function of the install script. fi - # Compense le bug de ssowat qui ne supprime pas l'entrée de l'app en cas d'erreur d'installation. + # Compensates the ssowat bug that does not remove the app's input in case of installation error. sudo sed -i "\@\"$domain$path/\":@d" /etc/ssowat/conf.json if [ "$ynh_version" = "2.2" ]; then - /bin/bash $script_dir/remove # Appel le script remove. En 2.2, ce comportement n'est pas automatique. + /bin/bash $script_dir/remove fi ynh_die @@ -36,31 +36,28 @@ TRAP_ON () { # Activate signal capture } TRAP_OFF () { # Ignoring signal capture until TRAP_ON - # Pour une raison que j'ignore, la fonction TRAP_ON fonctionne très bien. - # Mais pas la fonction TRAP_OFF... - # Utiliser directement `trap '' ERR` dans le code pour l'utiliser, à la place de la fonction. trap '' ERR # Ignoring exit signals } -CHECK_USER () { # Vérifie la validité de l'user admin -# $1 = Variable de l'user admin. +CHECK_USER () { # Check the validity of the user admin + # $1 = User admin variable ynh_user_exists "$1" || (echo "Wrong admin" >&2 && false) } -CHECK_PATH () { # Vérifie la présence du / en début de path. Et son absence à la fin. - if [ "${path:0:1}" != "/" ]; then # Si le premier caractère n'est pas un / - path="/$path" # Ajoute un / en début de path +CHECK_PATH () { # Checks / at the beginning of the path. And his absence at the end. + if [ "${path:0:1}" != "/" ]; then # If the first character is not / + path="/$path" # Add / at the beginning of path fi - if [ "${path:${#path}-1}" == "/" ] && [ ${#path} -gt 1 ]; then # Si le dernier caractère est un / et que ce n'est pas le seul caractère. - path="${path:0:${#path}-1}" # Supprime le dernier caractère + if [ "${path:${#path}-1}" == "/" ] && [ ${#path} -gt 1 ]; then # If the last character is a / and it is not the only character. + path="${path:0:${#path}-1}" # Delete last character fi } -CHECK_DOMAINPATH () { # Vérifie la disponibilité du path et du domaine. +CHECK_DOMAINPATH () { # Checks the availability of the path and domain. sudo yunohost app checkurl $domain$path -a $app } -CHECK_FINALPATH () { # Vérifie que le dossier de destination n'est pas déjà utilisé. +CHECK_FINALPATH () { # Checks that the destination folder is not already in use. final_path=/var/www/$app if [ -e "$final_path" ] then @@ -69,40 +66,40 @@ CHECK_FINALPATH () { # Vérifie que le dossier de destination n'est pas déjà u fi } -GENERATE_DB () { # Créer une base de données et un utilisateur dédié au nom de l'app. -# $1 = Nom de la base de donnée - # Génère un mot de passe aléatoire. +GENERATE_DB () { # Create a database and a dedicated user in the name of the app + # $1 = Database name + # Generates a random password. db_user=$1 db_pwd=$(head -n20 /dev/urandom | tr -c -d 'A-Za-z0-9' | head -c20) CHECK_VAR "$db_pwd" "db_pwd empty" - # Utilise '$app' comme nom d'utilisateur et de base de donnée - # Initialise la base de donnée et stocke le mot de passe mysql. + # Uses '$ app' as user name and database + # Initializes the database and stores the mysql password. ynh_mysql_create_db "$db_user" "$db_user" $db_pwd ynh_app_setting_set $app mysqlpwd $db_pwd } -SETUP_SOURCE () { # Télécharge la source, décompresse et copie dans $final_path -# $1 = Nom de l'archive téléchargée. +SETUP_SOURCE () { # Download source, decompress and copu into $final_path + # $1 = Nom de l'archive téléchargée. wget -nv --show-progress -i ../sources/source_url -O $1 - # Vérifie la somme de contrôle de la source téléchargée. + # Checks the checksum of the downloaded source. md5sum -c ../sources/source_md5 --status - # Décompresse la source - if [ "$(echo ${1##*.})" == "gz" ]; then + # Decompress source + if [ "$(echo ${1##*.})" == "tgz" ]; then tar -x -f $1 elif [ "$(echo ${1##*.})" == "zip" ]; then unzip -q $1 else - false # Format d'archive non pris en charge. + false # Unsupported archive format. fi - # Copie les fichiers sources + # Copy file source sudo cp -a $(cat ../sources/source_dir)/. "$final_path" - # Copie les fichiers additionnels ou modifiés. + # Copy additional file and modified if test -e "../sources/ajouts"; then sudo cp -a ../sources/ajouts/. "$final_path" fi } -POOL_FPM () { # Créer le fichier de configuration du pool php-fpm et le configure. +POOL_FPM () { # Create the php-fpm pool configuration file and configure it. sed -i "s@__NAMETOCHANGE__@$app@g" ../conf/php-fpm.conf sed -i "s@__FINALPATH__@$final_path@g" ../conf/php-fpm.conf finalphpconf=/etc/php5/fpm/pool.d/$app.conf @@ -114,22 +111,22 @@ POOL_FPM () { # Créer le fichier de configuration du pool php-fpm et le configu sudo service php5-fpm reload } -STORE_MD5_CONFIG () { # Enregistre la somme de contrôle du fichier de config -# $1 = Nom du fichier de conf pour le stockage dans settings.yml -# $2 = Nom complet et chemin du fichier de conf. +STORE_MD5_CONFIG () { # Saves the checksum of the config file + # $1 = Name of the conf file for storage in settings.yml + # $2 = Full name and path of the conf file. ynh_app_setting_set $app $1_file_md5 $(sudo md5sum "$2" | cut -d' ' -f1) } -CHECK_MD5_CONFIG () { # Créé un backup du fichier de config si il a été modifié. -# $1 = Nom du fichier de conf pour le stockage dans settings.yml -# $2 = Nom complet et chemin du fichier de conf. +CHECK_MD5_CONFIG () { # Created a backup of the config file if it was changed. + # $1 = Name of the conf file for storage in settings.yml + # $2 = Full name and path of the conf file.onf. if [ "$(ynh_app_setting_get $app $1_file_md5)" != $(sudo md5sum "$2" | cut -d' ' -f1) ]; then sudo cp -a "$2" "$2.backup.$(date '+%d.%m.%y_%Hh%M,%Ss')" # Si le fichier de config a été modifié, créer un backup. fi } -FIND_PORT () { # Cherche un port libre. -# $1 = Numéro de port pour débuter la recherche. +FIND_PORT () { # Search free port + # $1 = Port number to start the search. port=$1 while ! sudo yunohost app checkport $port ; do port=$((port+1)) @@ -140,7 +137,7 @@ FIND_PORT () { # Cherche un port libre. ### REMOVE SCRIPT -REMOVE_NGINX_CONF () { # Suppression de la configuration nginx +REMOVE_NGINX_CONF () { # Delete nginx configuration if [ -e "/etc/nginx/conf.d/$domain.d/$app.conf" ]; then # Delete nginx config echo "Delete nginx config" sudo rm "/etc/nginx/conf.d/$domain.d/$app.conf" @@ -148,7 +145,7 @@ REMOVE_NGINX_CONF () { # Suppression de la configuration nginx fi } -REMOVE_FPM_CONF () { # Suppression de la configuration du pool php-fpm +REMOVE_FPM_CONF () { # Delete pool php-fpm configuration if [ -e "/etc/php5/fpm/pool.d/$app.conf" ]; then # Delete fpm config echo "Delete fpm config" sudo rm "/etc/php5/fpm/pool.d/$app.conf" @@ -160,27 +157,27 @@ REMOVE_FPM_CONF () { # Suppression de la configuration du pool php-fpm sudo service php5-fpm reload } -REMOVE_LOGROTATE_CONF () { # Suppression de la configuration de logrotate +REMOVE_LOGROTATE_CONF () { # Delete logrotate configuration if [ -e "/etc/logrotate.d/$app" ]; then echo "Delete logrotate config" sudo rm "/etc/logrotate.d/$app" fi } -SECURE_REMOVE () { # Suppression de dossier avec vérification des variables - chaine="$1" # L'argument doit être donné entre quotes simple '', pour éviter d'interpréter les variables. +SECURE_REMOVE () { # Deleting a folder with variable verification + chaine="$1" # The argument must be given between simple quotes '', to avoid interpreting the variables. no_var=0 - while (echo "$chaine" | grep -q '\$') # Boucle tant qu'il y a des $ dans la chaine + while (echo "$chaine" | grep -q '\$') # Loop as long as there are $ in the string do no_var=1 - global_var=$(echo "$chaine" | cut -d '$' -f 2) # Isole la première variable trouvée. - only_var=\$$(expr "$global_var" : '\([A-Za-z0-9_]*\)') # Isole complètement la variable en ajoutant le $ au début et en gardant uniquement le nom de la variable. Se débarrasse surtout du / et d'un éventuel chemin derrière. - real_var=$(eval "echo ${only_var}") # `eval "echo ${var}` permet d'interpréter une variable contenue dans une variable. + global_var=$(echo "$chaine" | cut -d '$' -f 2) # Isole the first variable found. + only_var=\$$(expr "$global_var" : '\([A-Za-z0-9_]*\)') # Isole completely the variable by adding the $ at the beginning and keeping only the name of the variable. Mostly gets rid of / and a possible path behind. + real_var=$(eval "echo ${only_var}") # `eval "echo ${var}` Allows to interpret a variable contained in a variable. if test -z "$real_var" || [ "$real_var" = "/" ]; then echo "Variable $only_var is empty, suppression of $chaine cancelled." >&2 return 1 fi - chaine=$(echo "$chaine" | sed "s@$only_var@$real_var@") # remplace la variable par sa valeur dans la chaine. + chaine=$(echo "$chaine" | sed "s@$only_var@$real_var@") # Replaces variable with its value in the string. done if [ "$no_var" -eq 1 ] then @@ -195,9 +192,9 @@ SECURE_REMOVE () { # Suppression de dossier avec vérification des variable fi } -REMOVE_BDD () { # Suppression de la base de donnée et de l'utilisateur associé. -# $1 = Nom de la base de donnée - # Utilise '$app' comme nom d'utilisateur et de base de donnée +REMOVE_BDD () { # Delete database and users + # $1 = Database name + # Uses '$app' as user name and database db_user=$1 if mysqlshow -u root -p$(sudo cat $MYSQL_ROOT_PWD_FILE) | grep -q "^| $db_user"; then echo "Delete db" diff --git a/scripts/install b/scripts/install index f1f0266..e6154b5 100644 --- a/scripts/install +++ b/scripts/install @@ -3,16 +3,15 @@ # Exit on command errors and treat unset variables as an error set -eu -source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script -# Source app helpers -source /usr/share/yunohost/helpers +source .fonctions # Loads the generic functions usually used in the script +source /usr/share/yunohost/helpers # Source app helpers CLEAN_SETUP () { -# Nettoyage des résidus d'installation non pris en charge par le script remove. + # Clean installation residues that are not supported by the remove script. # Clean hosts sudo sed -i '/#SPIP/d' /etc/hosts } -TRAP_ON # Active trap pour arrêter le script si une erreur est détectée. +TRAP_ON # Active trap to stop the script if an error is detected. domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH @@ -42,23 +41,23 @@ ynh_app_setting_set $app language $language ynh_app_setting_set $app ldap $ldap #ynh_app_setting_set $app multisite $multisite -GENERATE_DB $app # Créer une base de données et un utilisateur dédié au nom de l'app. +GENERATE_DB $app # Create a database and a dedicated user in the app name -# Crée le repertoire de destination et stocke son emplacement. +# Creates the destination directory and stores its location. sudo mkdir "$final_path" ynh_app_setting_set $app final_path $final_path SETUP_SOURCE "spip-3.1.zip" -# Set permissions du répertoire spip +# Set permissions spip directory sudo chown -R www-data: $final_path echo -e "127.0.0.1 $domain #SPIP" | sudo tee -a /etc/hosts -# Et copie le fichier de config nginx +# Copy nginx configuration sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf -# Modifie les variables dans le fichier de configuration nginx +# Modif the variables in the nginx configuration file sudo sed -i "s@__PATHTOCHANGE__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf sudo sed -i "s@__FINALPATH__@$final_path@g" /etc/nginx/conf.d/$domain.d/$app.conf sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf @@ -73,7 +72,7 @@ POOL_FPM sudo cp ../conf/connect.php $final_path/config/connect.php sudo cp ../conf/mes_options.php $final_path/config/mes_options.php -# Changer les variables du fichier de configuration de SPIP +# Change SPIP configuration file variables sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php @@ -81,7 +80,7 @@ db_md5=$(echo $db_pwd | md5sum | awk '{print $1}') db_sha=$(echo $db_pwd | openssl dgst -sha1 -hmac "key" | awk -F'= ' {'print $2'}) language="$(echo $language | head -c 2)" -# Changer les informations de la tables spip_auteurs +# Change spip_auteurs table informations sudo sed -i "s@__ADMIN_SPIP__@$admin_spip@g" ../conf/sql/spip.sql sudo sed -i "s@__PATH__@$path@g" ../conf/sql/spip.sql sudo sed -i "s@__DB_USER__@$db_user@g" ../conf/sql/spip.sql @@ -103,10 +102,10 @@ do sudo sed -i "s/__ALEA_FUTUR__/$j/g" ../conf/sql/spip.sql done -# Charger la structure des tables dans la base. +# Load the tables structure into the database. mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/spip.sql -# Utilisation de LDAP pour SPIP +# Use LDAP for SPIP if [ "$ldap" = "Yes" ]; then sudo cp ../conf/ldap.php $final_path/config/ldap.php @@ -124,12 +123,12 @@ then ynh_app_setting_set "$app" unprotected_uris "/" fi -# Régénère la configuration de SSOwat +# Reload SSOwat configuration sudo yunohost app ssowatconf # Reload Nginx and regenerate SSOwat conf sudo service php5-fpm restart sudo service nginx reload -# Nettoyer hosts +# clean hosts sudo sed -i '/#SPIP/d' /etc/hosts \ No newline at end of file diff --git a/scripts/remove b/scripts/remove index 51e35a6..7f8d52d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -3,24 +3,22 @@ # Exit on command errors and treat unset variables as an error set -u -source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script +source .fonctions # Loads the generic functions usually used in the script +source /usr/share/yunohost/helpers # Source app helpers -# Source app helpers -source /usr/share/yunohost/helpers - -# Récupère les infos de l'application. +# Retrieves application info. app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) -REMOVE_BDD $app # Suppression de la base de donnée et de l'utilisateur associé. +REMOVE_BDD $app # Deleting the database and the associated user. -SECURE_REMOVE '/var/www/$app' # Suppression du dossier de l'application +SECURE_REMOVE '/var/www/$app' # Removing the application folder -REMOVE_NGINX_CONF # Suppression de la configuration nginx +REMOVE_NGINX_CONF # Deleting the nginx configuration -REMOVE_FPM_CONF # Suppression de la configuration du pool php-fpm +REMOVE_FPM_CONF # Deleting the php-fpm pool configuration -# Régénère la configuration de SSOwat +# Reload SSOwat configuration sudo yunohost app ssowatconf echo -e "\e[0m" # Restore normal color \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index 4d225e0..a646aaa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,10 +44,7 @@ sudo sed -i -e "s/'DB_USER', *'[^']*'/'DB_USER', '$app'/g" $final_path/config/co sudo sed -i -e "s/'DB_NAME', *'[^']*'/'DB_NAME', '$app'/g" $final_path/config/connect.php # Set permissions -# Les fichiers appartiennent à www-data, pour permettre les mises à jour. sudo chown -R www-data: $final_path -# Sauf le fichier de config connect.php qui appartient à root -sudo chown root: $final_path/config/connect.php # Copy dedicated php-fpm process from backup folder to the right location sudo cp -a $backup_dir/conf/php-fpm.conf /etc/php5/fpm/pool.d/$app.conf diff --git a/scripts/upgrade b/scripts/upgrade index db8f0f7..5e42c3b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -3,7 +3,7 @@ # Exit on command errors and treat unset variables as an error set -eu -source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script +source .fonctions # Loads the generic functions usually used in the script # See comments in install script app=$YNH_APP_INSTANCE_NAME @@ -18,7 +18,7 @@ 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 # Vérifie et corrige la syntaxe du path. +CHECK_PATH # Checks and corrects the syntax of the path. # Check if admin is not null if [[ "$admin" = "" || "$is_public" = "" || "$language" = "" ]]; then @@ -32,7 +32,7 @@ final_path=/var/www/$app db_name=$app -CHECK_MD5_CONFIG "connect.php" "$final_path/config/connect.php" # Créé un backup du fichier de config si il a été modifié. +CHECK_MD5_CONFIG "connect.php" "$final_path/config/connect.php" # Created a backup of the config file if it was changed. # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf* From ac3c05049118198bd20009607c68aab3cd9d1457 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 8 Mar 2017 00:43:41 +0100 Subject: [PATCH 81/97] =?UTF-8?q?Source=20au=20m=C3=AAme=20endroite=20pour?= =?UTF-8?q?=20upgrade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/upgrade | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5e42c3b..554a594 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -4,13 +4,11 @@ set -eu source .fonctions # Loads the generic functions usually used in the script +source /usr/share/yunohost/helpers # Source YunoHost helpers # See comments in install script app=$YNH_APP_INSTANCE_NAME -# Source YunoHost helpers -source /usr/share/yunohost/helpers - # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) path=$(ynh_app_setting_get "$app" path) From 249c7c7b1ea5b063f93d7a7560cc0942fdd4dd16 Mon Sep 17 00:00:00 2001 From: b_b Date: Wed, 8 Mar 2017 00:45:49 +0100 Subject: [PATCH 82/97] SPIP ;) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4222a78..5eccd8a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # SPIP for YunoHost -## Spip c'est quoi ? +## SPIP c'est quoi ? SPIP est un système de publication pour l’Internet qui s’attache particulièrement au fonctionnement collectif, au multilinguisme et à la facilité d’emploi. C’est un logiciel libre, distribué sous la licence GNU/GPL. Il peut ainsi être utilisé pour tout site Internet, qu’il soit associatif ou institutionnel, personnel ou marchand. @@ -28,7 +28,7 @@ https://www.domain.tld/spip/ecrire Faire une demande de "mot de passe oublié" pour changer votre mot de passe, vous recevez un email vous indiquant comment procéder au changement de mot de passe. -## What is Spip? +## What is SPIP? SPIP is a publishing system for the Internet in which great importance is attached to collaborative working, to multilingual environments, and to simplicity of use for web authors. It is free software, distributed under the GNU/GPL licence. This means that it can be used for any Internet site, whether personal or institutional, non-profit or commercial. From 9fbcdb87bd8e70d7b348f5473882e6be09b5d2c3 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 8 Mar 2017 13:15:16 +0100 Subject: [PATCH 83/97] Remplacer + bug sur upgrade --- scripts/backup | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index 58a7016..419c0d3 100644 --- a/scripts/backup +++ b/scripts/backup @@ -7,7 +7,7 @@ set -eu backup_dir=$1 # The parameter $2 is theid of the app instance -app=$2 +app=$YNH_APP_INSTANCE_NAME # Source app helpers source /usr/share/yunohost/helpers diff --git a/scripts/restore b/scripts/restore index a646aaa..daccfe9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -8,7 +8,7 @@ set -eu backup_dir=$1 # The parameter $2 is the id of the app instance ex: ynhexample__2 -app=$2 +app=$YNH_APP_INSTANCE_NAME # Source app helpers source /usr/share/yunohost/helpers diff --git a/scripts/upgrade b/scripts/upgrade index 554a594..0462912 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,8 +33,8 @@ db_name=$app CHECK_MD5_CONFIG "connect.php" "$final_path/config/connect.php" # Created a backup of the config file if it was changed. # Modify Nginx configuration file and copy it to Nginx conf directory -sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf* -sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* +sed -i "s@__PATHTOCHANGE__@$app@g" ../conf/nginx.conf* +sed -i "s@__FINALPATH__@$final_path/@g" ../conf/nginx.conf* if [ $is_public = "Yes" ]; then From 778035932c3cabab99e00f8d880cc4208137e052 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 8 Mar 2017 18:32:51 +0100 Subject: [PATCH 84/97] Sera remis le check du md5 quand le fichier SPIP ne changera pas de md5 tous les jours --- scripts/.fonctions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.fonctions b/scripts/.fonctions index 2d47932..18cef3d 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -82,7 +82,7 @@ SETUP_SOURCE () { # Download source, decompress and copu into $final_path # $1 = Nom de l'archive téléchargée. wget -nv --show-progress -i ../sources/source_url -O $1 # Checks the checksum of the downloaded source. - md5sum -c ../sources/source_md5 --status + # md5sum -c ../sources/source_md5 --status # Decompress source if [ "$(echo ${1##*.})" == "tgz" ]; then tar -x -f $1 From f28adb37b8d5700f3fcb8a025bea4301cb8f4a88 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Wed, 8 Mar 2017 23:41:35 +0100 Subject: [PATCH 85/97] Bug lors de la copie de la conf Nginx sur l'upgrade --- scripts/upgrade | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0462912..d79a599 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,18 +36,11 @@ CHECK_MD5_CONFIG "connect.php" "$final_path/config/connect.php" # Created a back sed -i "s@__PATHTOCHANGE__@$app@g" ../conf/nginx.conf* sed -i "s@__FINALPATH__@$final_path/@g" ../conf/nginx.conf* +# If app is public, add url to SSOWat conf as skipped_uris if [ $is_public = "Yes" ]; then - sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf -else - sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf -fi - -# If app is public, add url to SSOWat conf as skipped_uris -if [[ $is_public -eq 1 ]]; then - # See install script ynh_app_setting_set "$app" unprotected_uris "/" - sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf + 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 From b0d42eda33258d1c739e1243bec9e08b5c2d4e43 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 00:38:53 +0100 Subject: [PATCH 86/97] =?UTF-8?q?Variable=20d=C3=A9precier=20et=20check=5F?= =?UTF-8?q?process=20multisite=20supprim=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- check_process | 25 ------------------------- scripts/backup | 2 +- scripts/restore | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/check_process b/check_process index c6c6846..eb7a25c 100644 --- a/check_process +++ b/check_process @@ -24,31 +24,6 @@ fail_download_source=0 port_already_use=0 final_path_already_use=0 -;; Test avec multisite - auto_remove=1 - ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) - language="fr_FR" - multisite="Yes" - is_public="Yes" (PUBLIC|public=Yes|private=No) - ; Checks - setup_sub_dir=1 - setup_root=0 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - backup_restore=1 - multi_instance=1 - 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/scripts/backup b/scripts/backup index 419c0d3..973e26a 100644 --- a/scripts/backup +++ b/scripts/backup @@ -4,7 +4,7 @@ set -eu # The parameter $1 is the backup directory location dedicated to the app -backup_dir=$1 +backup_dir=$YNH_APP_ARG_PATH # The parameter $2 is theid of the app instance app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/restore b/scripts/restore index daccfe9..dfe5e06 100644 --- a/scripts/restore +++ b/scripts/restore @@ -5,7 +5,7 @@ set -eu # The parameter $1 is the backup directory location dedicated to the app -backup_dir=$1 +backup_dir=$YNH_APP_ARG_PATH # The parameter $2 is the id of the app instance ex: ynhexample__2 app=$YNH_APP_INSTANCE_NAME From c06897cecbeb57226956fd85a1b9e9104d6e0b9d Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 01:15:36 +0100 Subject: [PATCH 87/97] Refactoriser backup/restore --- scripts/backup | 30 ++++++++++++++---------------- scripts/restore | 49 +++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 42 deletions(-) diff --git a/scripts/backup b/scripts/backup index 973e26a..805f30c 100644 --- a/scripts/backup +++ b/scripts/backup @@ -3,30 +3,28 @@ # Exit on command errors and treat unset variables as an error set -eu -# The parameter $1 is the backup directory location dedicated to the app -backup_dir=$YNH_APP_ARG_PATH - -# The parameter $2 is theid of the app instance +# Get multi-instances specific variables app=$YNH_APP_INSTANCE_NAME # Source app helpers source /usr/share/yunohost/helpers -domain=$(ynh_app_setting_get $app domain) -final_path=$(ynh_app_setting_get $app final_path) +# Retrieve app settings +domain=$(ynh_app_setting_get "$app" domain) +path=$(ynh_app_setting_get "$app" final_path) +with_mysql=$(ynh_app_setting_get "$app" with_mysql) # Copy the app files -sudo mkdir -p ${backup_dir}/var/www -sudo cp -a $final_path "${backup_dir}/var/www/$app" +DESTDIR="/var/www/${app}" +ynh_backup "$DESTDIR" "sources" 1 # Copy the conf files -sudo mkdir -p "${backup_dir}/conf" -sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf "${backup_dir}/conf/nginx.conf" - -# Copy dedicated php-fpm process to backup folder -sudo cp -a /etc/php5/fpm/pool.d/$app.conf "${backup_dir}/conf/php-fpm.conf" -sudo cp -a /etc/php5/fpm/conf.d/20-$app.ini "${backup_dir}/conf/php-fpm.ini" +ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "conf/nginx.conf" +ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "conf/php-fpm.conf" +ynh_backup "/etc/php5/fpm/conf.d/20-${app}.ini" "conf/php-fpm.ini" # Backup db -root_pwd=$(sudo cat /etc/yunohost/mysql) -sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ${backup_dir}/db.sql" +if [[ $with_mysql -eq 1 ]]; then + root_pwd=$(sudo cat /etc/yunohost/mysql) + sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ./db.sql" +fi \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index dfe5e06..93810d8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -4,9 +4,6 @@ # Exit on command errors and treat unset variables as an error set -eu -# The parameter $1 is the backup directory location dedicated to the app -backup_dir=$YNH_APP_ARG_PATH - # The parameter $2 is the id of the app instance ex: ynhexample__2 app=$YNH_APP_INSTANCE_NAME @@ -23,38 +20,38 @@ if [ -d $final_path ]; then ynh_die "There is already a directory: $final_path" fi -conf=/etc/nginx/conf.d/$domain.d/$app.conf -if [ -f $conf ]; then - ynh_die "There is already a nginx conf file at this path: $conf" -fi -# Restore conf files -sudo cp -a "${backup_dir}/conf/nginx.conf" $conf +# Check configuration files php-fpm +nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" +[[ -f $nginx_conf ]] && ynh_die \ +"The NGINX configuration already exists at '${nginx_conf}'. + You should safely delete it before restoring this app." +phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" +[[ -f $phpfpm_conf ]] && ynh_die \ +"The PHP FPM configuration already exists at '${phpfpm_conf}'. + You should safely delete it before restoring this app." +phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" +[[ -f $phpfpm_ini ]] && ynh_die \ +"The PHP FPM INI configuration already exists at '${phpfpm_ini}'. + You should safely delete it before restoring this app." -# Reload Nginx -sudo service nginx reload - -sudo cp -a "${backup_dir}/var/www/$app" $final_path +sudo cp -a ./sources $final_path db_pwd=$(ynh_app_setting_get $app mysqlpwd) db_user=$app ynh_mysql_create_db $db_user $db_user $db_pwd -sudo su -c "mysql -u $db_user -p$db_pwd $app < ${backup_dir}/db.sql" -sudo rm -f "${backup_dir}/db.sql" +sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" +sudo rm -f "./db.sql" sudo sed -i -e "s/'DB_USER', *'[^']*'/'DB_USER', '$app'/g" $final_path/config/connect.php sudo sed -i -e "s/'DB_NAME', *'[^']*'/'DB_NAME', '$app'/g" $final_path/config/connect.php # Set permissions sudo chown -R www-data: $final_path -# Copy dedicated php-fpm process from backup folder to the right location -sudo cp -a $backup_dir/conf/php-fpm.conf /etc/php5/fpm/pool.d/$app.conf -sudo cp -a $backup_dir/conf/php-fpm.ini /etc/php5/fpm/conf.d/20-$app.ini -# And restart service -sudo service php5-fpm reload +# Restore configuration files +sudo cp -a ./conf/nginx.conf "$nginx_conf" +sudo cp -a ./conf/php-fpm.conf "$phpfpm_conf" +sudo cp -a ./conf/php-fpm.ini "$phpfpm_ini" -# Set ssowat config -if [ "$is_public" = "No" ]; -then - ynh_app_setting_delete $app skipped_uris -fi -sudo yunohost app ssowatconf +# Reload services +sudo service php5-fpm reload || true +sudo service nginx reload || true \ No newline at end of file From 4d924b6e3fd7b34ac7bb3712470b7b23d698eeb8 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 15:01:44 +0100 Subject: [PATCH 88/97] Correction Backup/restore --- scripts/backup | 14 +++++++------- scripts/restore | 40 +++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/scripts/backup b/scripts/backup index 805f30c..0ca3670 100644 --- a/scripts/backup +++ b/scripts/backup @@ -11,17 +11,17 @@ source /usr/share/yunohost/helpers # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) -path=$(ynh_app_setting_get "$app" final_path) with_mysql=$(ynh_app_setting_get "$app" with_mysql) # Copy the app files -DESTDIR="/var/www/${app}" -ynh_backup "$DESTDIR" "sources" 1 +final_path="/var/www/${app}" +ynh_backup "$final_path" "sources" 1 -# Copy the conf files -ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "conf/nginx.conf" -ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "conf/php-fpm.conf" -ynh_backup "/etc/php5/fpm/conf.d/20-${app}.ini" "conf/php-fpm.ini" +# Copy the nginx conf files +ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" +# Copy the php-fpm conf files +ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf" +ynh_backup "/etc/php5/fpm/conf.d/20-${app}.ini" "php-fpm.ini" # Backup db if [[ $with_mysql -eq 1 ]]; then diff --git a/scripts/restore b/scripts/restore index 93810d8..152605d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,11 +14,15 @@ source /usr/share/yunohost/helpers domain=$(ynh_app_setting_get $app domain) path=$(ynh_app_setting_get $app path) is_public=$(ynh_app_setting_get $app is_public) -final_path=$(ynh_app_setting_get $app final_path) +with_mysql=$(ynh_app_setting_get "$app" with_mysql) -if [ -d $final_path ]; then - ynh_die "There is already a directory: $final_path" -fi +# Check domain/path availability +sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || ynh_die "Path not available: ${domain}${path}" + +# Restore sources & data +final_path="/var/www/${app}" +sudo cp -a ./sources "$final_path" # Check configuration files php-fpm nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" @@ -34,23 +38,25 @@ phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. You should safely delete it before restoring this app." -sudo cp -a ./sources $final_path - -db_pwd=$(ynh_app_setting_get $app mysqlpwd) -db_user=$app -ynh_mysql_create_db $db_user $db_user $db_pwd -sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" -sudo rm -f "./db.sql" -sudo sed -i -e "s/'DB_USER', *'[^']*'/'DB_USER', '$app'/g" $final_path/config/connect.php -sudo sed -i -e "s/'DB_NAME', *'[^']*'/'DB_NAME', '$app'/g" $final_path/config/connect.php +# Restore db +if [[ $with_mysql -eq 1 ]]; then + db_pwd=$(ynh_app_setting_get $app mysqlpwd) + db_user=$app + ynh_mysql_create_db $db_user $db_user $db_pwd + sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" + sudo rm -f "./db.sql" + sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php + # sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php +fi # Set permissions sudo chown -R www-data: $final_path -# Restore configuration files -sudo cp -a ./conf/nginx.conf "$nginx_conf" -sudo cp -a ./conf/php-fpm.conf "$phpfpm_conf" -sudo cp -a ./conf/php-fpm.ini "$phpfpm_ini" +# Restore nginx configuration files +sudo cp -a ./nginx.conf "$nginx_conf" +# Restore php-fpm configuration files +sudo cp -a ./php-fpm.conf "$phpfpm_conf" +sudo cp -a ./php-fpm.ini "$phpfpm_ini" # Reload services sudo service php5-fpm reload || true From c8ef25de200119793328b6c03e6707bf857e31c7 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 16:06:32 +0100 Subject: [PATCH 89/97] =?UTF-8?q?Correction=20sur=20le=20connect.php=20pou?= =?UTF-8?q?r=20remplacer=20les=20bons=20param=C3=A8tres=20de=20connexion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 152605d..b73df61 100644 --- a/scripts/restore +++ b/scripts/restore @@ -45,8 +45,10 @@ if [[ $with_mysql -eq 1 ]]; then ynh_mysql_create_db $db_user $db_user $db_pwd sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" sudo rm -f "./db.sql" - sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php + # sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php # sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php + sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php + sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php fi # Set permissions From 9035ae1af3d9aa50438274644a0b91e5ffe86a9b Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 16:24:19 +0100 Subject: [PATCH 90/97] =?UTF-8?q?D=C3=A9placer=20les=20fichier=20apr=C3=A8?= =?UTF-8?q?s=20un=20exit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/restore b/scripts/restore index b73df61..445124d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,10 +20,6 @@ with_mysql=$(ynh_app_setting_get "$app" with_mysql) sudo yunohost app checkurl "${domain}${path}" -a "$app" \ || ynh_die "Path not available: ${domain}${path}" -# Restore sources & data -final_path="/var/www/${app}" -sudo cp -a ./sources "$final_path" - # Check configuration files php-fpm nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" [[ -f $nginx_conf ]] && ynh_die \ @@ -38,6 +34,13 @@ phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. You should safely delete it before restoring this app." + # Restore sources & data +final_path="/var/www/${app}" +sudo cp -a ./sources "$final_path" + +# Set permissions +sudo chown -R www-data: $final_path + # Restore db if [[ $with_mysql -eq 1 ]]; then db_pwd=$(ynh_app_setting_get $app mysqlpwd) @@ -51,9 +54,6 @@ if [[ $with_mysql -eq 1 ]]; then sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php fi -# Set permissions -sudo chown -R www-data: $final_path - # Restore nginx configuration files sudo cp -a ./nginx.conf "$nginx_conf" # Restore php-fpm configuration files From e0113265720ecfb86159b5957f1630ceef92ee52 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 16:47:17 +0100 Subject: [PATCH 91/97] =?UTF-8?q?Commenter=20la=20ligne=20qui=20pose=20pro?= =?UTF-8?q?bl=C3=A8me=20sur=20Linter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/restore b/scripts/restore index 445124d..95a0b4f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -29,10 +29,10 @@ phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" [[ -f $phpfpm_conf ]] && ynh_die \ "The PHP FPM configuration already exists at '${phpfpm_conf}'. You should safely delete it before restoring this app." -phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" -[[ -f $phpfpm_ini ]] && ynh_die \ -"The PHP FPM INI configuration already exists at '${phpfpm_ini}'. - You should safely delete it before restoring this app." +# phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" +# [[ -f $phpfpm_ini ]] && ynh_die \ +# "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. +# You should safely delete it before restoring this app." # Restore sources & data final_path="/var/www/${app}" @@ -48,8 +48,6 @@ if [[ $with_mysql -eq 1 ]]; then ynh_mysql_create_db $db_user $db_user $db_pwd sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" sudo rm -f "./db.sql" - # sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php - # sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php fi From 31d0baddbda0a933fbd5526aeeea3b5e794d3285 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 17:24:34 +0100 Subject: [PATCH 92/97] =?UTF-8?q?D=C3=A9commenter=20la=20ligne=20qui=20pos?= =?UTF-8?q?e=20probl=C3=A8me=20sur=20Linter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/restore b/scripts/restore index 95a0b4f..445124d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -29,10 +29,10 @@ phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" [[ -f $phpfpm_conf ]] && ynh_die \ "The PHP FPM configuration already exists at '${phpfpm_conf}'. You should safely delete it before restoring this app." -# phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" -# [[ -f $phpfpm_ini ]] && ynh_die \ -# "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. -# You should safely delete it before restoring this app." +phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" +[[ -f $phpfpm_ini ]] && ynh_die \ +"The PHP FPM INI configuration already exists at '${phpfpm_ini}'. + You should safely delete it before restoring this app." # Restore sources & data final_path="/var/www/${app}" @@ -48,6 +48,8 @@ if [[ $with_mysql -eq 1 ]]; then ynh_mysql_create_db $db_user $db_user $db_pwd sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" sudo rm -f "./db.sql" + # sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php + # sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php fi From 83e03f813481d7d66a01eb4cee01c3cc9900ccae Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 17:59:55 +0100 Subject: [PATCH 93/97] On supprime les test sur les fichiers dans restore --- scripts/restore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/restore b/scripts/restore index 445124d..c2c19f1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -21,18 +21,18 @@ sudo yunohost app checkurl "${domain}${path}" -a "$app" \ || ynh_die "Path not available: ${domain}${path}" # Check configuration files php-fpm -nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" -[[ -f $nginx_conf ]] && ynh_die \ -"The NGINX configuration already exists at '${nginx_conf}'. - You should safely delete it before restoring this app." -phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" -[[ -f $phpfpm_conf ]] && ynh_die \ -"The PHP FPM configuration already exists at '${phpfpm_conf}'. - You should safely delete it before restoring this app." -phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" -[[ -f $phpfpm_ini ]] && ynh_die \ -"The PHP FPM INI configuration already exists at '${phpfpm_ini}'. - You should safely delete it before restoring this app." +# nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" +# [[ -f $nginx_conf ]] && ynh_die \ +# "The NGINX configuration already exists at '${nginx_conf}'. +# You should safely delete it before restoring this app." +# phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" +# [[ -f $phpfpm_conf ]] && ynh_die \ +# "The PHP FPM configuration already exists at '${phpfpm_conf}'. +# You should safely delete it before restoring this app." +# phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" +# [[ -f $phpfpm_ini ]] && ynh_die \ +# "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. +# You should safely delete it before restoring this app." # Restore sources & data final_path="/var/www/${app}" From 78cdc47d289f71e252af4a5d3ea351f0a74f5435 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 10 Mar 2017 15:35:27 +0100 Subject: [PATCH 94/97] =?UTF-8?q?V=C3=A9rifier=20les=20fichiers=20de=20con?= =?UTF-8?q?f=20et=20le=20r=C3=A9pertoire=20final=5Fpath=20lors=20du=20rest?= =?UTF-8?q?ore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/scripts/restore b/scripts/restore index c2c19f1..27d3152 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,22 +20,29 @@ with_mysql=$(ynh_app_setting_get "$app" with_mysql) sudo yunohost app checkurl "${domain}${path}" -a "$app" \ || ynh_die "Path not available: ${domain}${path}" +# Check $final_path +final_path="/var/www/${app}" +if [ -d $final_path ]; then + ynh_die "There is already a directory: $final_path" +fi + +# Check configuration files nginx +nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" +if [ -f $nginx_conf ]; then + ynh_die "The NGINX configuration already exists at '${nginx_conf}'. You should safely delete it before restoring this app." + # Check configuration files php-fpm -# nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" -# [[ -f $nginx_conf ]] && ynh_die \ -# "The NGINX configuration already exists at '${nginx_conf}'. -# You should safely delete it before restoring this app." -# phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" -# [[ -f $phpfpm_conf ]] && ynh_die \ -# "The PHP FPM configuration already exists at '${phpfpm_conf}'. -# You should safely delete it before restoring this app." -# phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" -# [[ -f $phpfpm_ini ]] && ynh_die \ -# "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. -# You should safely delete it before restoring this app." +phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" +if [ -f $phpfpm_conf ]; then + ynh_die "The PHP FPM configuration already exists at '${phpfpm_conf}'. You should safely delete it before restoring this app." +fi + +phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" +if [ -f $phpfpm_ini ]; then + ynh_die "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. You should safely delete it before restoring this app." +fi # Restore sources & data -final_path="/var/www/${app}" sudo cp -a ./sources "$final_path" # Set permissions From e8defe86dbeb7e9726e7487469e7b65e7e9b628c Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 10 Mar 2017 16:09:11 +0100 Subject: [PATCH 95/97] Virer Multisite dans le check_process --- check_process | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/check_process b/check_process index eb7a25c..c07c2ba 100644 --- a/check_process +++ b/check_process @@ -5,7 +5,6 @@ path="/path" (PATH) admin="john" (USER) language="fr_FR" - multisite="No" is_public="Yes" (PUBLIC|public=Yes|private=No) ; Checks pkg_linter=1 @@ -16,7 +15,7 @@ setup_public=1 upgrade=1 backup_restore=1 - multi_instance=1 + multi_instance=0 wrong_user=1 wrong_path=1 incorrect_path=1 From 3e35c5e57de09de2dc6c8222c6708296075adea2 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Fri, 10 Mar 2017 22:47:54 +0100 Subject: [PATCH 96/97] Refactoring remove --- scripts/remove | 35 ++++++++++++++++++++++------------- scripts/restore | 2 +- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/scripts/remove b/scripts/remove index 7f8d52d..4c6335b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -3,22 +3,31 @@ # Exit on command errors and treat unset variables as an error set -u -source .fonctions # Loads the generic functions usually used in the script -source /usr/share/yunohost/helpers # Source app helpers - -# Retrieves application info. +# Get multi-instances specific variables app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -REMOVE_BDD $app # Deleting the database and the associated user. +# Source app helpers +. /usr/share/yunohost/helpers -SECURE_REMOVE '/var/www/$app' # Removing the application folder +# Retrieve app settings +domain=$(ynh_app_setting_get "$app" domain) +with_mysql=$(ynh_app_setting_get "$app" with_mysql) -REMOVE_NGINX_CONF # Deleting the nginx configuration +# Drop MySQL database and user as needed +if [[ $with_mysql -eq 1 ]]; then + dbname=$app + dbuser=$app + dbpass=$(ynh_app_setting_get "$app" mysqlpwd) + ynh_mysql_drop_db $dbname || true + ynh_mysql_drop_user $dbuser || true +fi -REMOVE_FPM_CONF # Deleting the php-fpm pool configuration +# Delete app directory and configurations +sudo rm -rf "/var/www/${app}" +sudo rm -f "/etc/php5/fpm/pool.d/${app}.conf" +sudo rm -f "/etc/php5/fpm/conf.d/20-${app}.ini" +[[ -n $domain ]] && sudo rm -f "/etc/nginx/conf.d/${domain}.d/${app}.conf" -# Reload SSOwat configuration -sudo yunohost app ssowatconf - -echo -e "\e[0m" # Restore normal color \ No newline at end of file +# Reload services +sudo service php5-fpm restart || true +sudo service nginx reload || true \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index 27d3152..e4bca8f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -69,4 +69,4 @@ sudo cp -a ./php-fpm.ini "$phpfpm_ini" # Reload services sudo service php5-fpm reload || true -sudo service nginx reload || true \ No newline at end of file +sudo service nginx reload || true From 3c207dbe11c0abf40b5c698285b7da602c545bb7 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Sat, 11 Mar 2017 00:32:17 +0100 Subject: [PATCH 97/97] =?UTF-8?q?Sans=20with=20mysql=20pour=20v=C3=A9rifie?= =?UTF-8?q?r=20si=20Linter=20passe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/restore b/scripts/restore index e4bca8f..0f6132c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers domain=$(ynh_app_setting_get $app domain) path=$(ynh_app_setting_get $app path) is_public=$(ynh_app_setting_get $app is_public) -with_mysql=$(ynh_app_setting_get "$app" with_mysql) +# with_mysql=$(ynh_app_setting_get "$app" with_mysql) # Check domain/path availability sudo yunohost app checkurl "${domain}${path}" -a "$app" \ @@ -49,17 +49,17 @@ sudo cp -a ./sources "$final_path" sudo chown -R www-data: $final_path # Restore db -if [[ $with_mysql -eq 1 ]]; then - db_pwd=$(ynh_app_setting_get $app mysqlpwd) - db_user=$app - ynh_mysql_create_db $db_user $db_user $db_pwd - sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" - sudo rm -f "./db.sql" - # sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php - # sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php - sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php - sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php -fi +# if [[ $with_mysql -eq 1 ]]; then +db_pwd=$(ynh_app_setting_get $app mysqlpwd) +db_user=$app +ynh_mysql_create_db $db_user $db_user $db_pwd +sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" +sudo rm -f "./db.sql" +# sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php +# sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php +sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php +sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php +# fi # Restore nginx configuration files sudo cp -a ./nginx.conf "$nginx_conf"