mirror of
https://github.com/YunoHost-Apps/spip_ynh.git
synced 2024-09-03 20:25:59 +02:00
Correction nginc conf pour ecrire
This commit is contained in:
parent
3c32eb4f7d
commit
46a4579b76
3 changed files with 60 additions and 33 deletions
|
@ -1,3 +1,9 @@
|
|||
# SPIP_ynh
|
||||
|
||||
## Spip for YunoHost
|
||||
|
||||
### Configuration
|
||||
|
||||
1) Start url https://domaine.tld/spip/ecrire
|
||||
2) Check SQL password /var/www/spip/tmp/connect.txt
|
||||
3) Delete SQL password file
|
|
@ -1,30 +1,52 @@
|
|||
location PATHTOCHANGE {
|
||||
alias ALIASTOCHANGE;
|
||||
if ($scheme = http) {
|
||||
rewrite ^ https://$server_name$request_uri? permanent;
|
||||
}
|
||||
index spip.php;
|
||||
if (!-e $request_filename)
|
||||
{
|
||||
rewrite ^(.+)$ PATHTOCHANGE/spip.php?page=$1 last;
|
||||
}
|
||||
client_max_body_size 30m;
|
||||
location ~^/(tmp|config)/{
|
||||
return 403;
|
||||
}
|
||||
location / {
|
||||
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 spip.php;
|
||||
include fastcgi_params;
|
||||
fastcgi_param REMOTE_USER $remote_user;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
fastcgi_param SCRIPT_FILENAME $request_filename;
|
||||
}
|
||||
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.
|
||||
|
||||
# Include SSOWAT user panel.
|
||||
include conf.d/yunohost_panel.conf.inc;
|
||||
# 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-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;
|
||||
}
|
|
@ -4,8 +4,6 @@
|
|||
domain=$1
|
||||
path=$2
|
||||
admin_spip=$3
|
||||
language=$4
|
||||
is_public=$5
|
||||
|
||||
# Check if admin exists
|
||||
sudo yunohost user list --json | grep -q "\"username\": \"$admin_spip\""
|
||||
|
@ -14,8 +12,6 @@ if [[ ! $? -eq 0 ]]; then
|
|||
exit 1
|
||||
fi
|
||||
sudo yunohost app setting spip admin -v $admin_spip
|
||||
sudo yunohost app setting spip language -v $language
|
||||
sudo yunohost app setting spip is_public -v $is_public
|
||||
|
||||
# Check domain/path availability
|
||||
sudo yunohost app checkurl $domain$path -a spip
|
||||
|
@ -52,6 +48,9 @@ sudo cp ../conf/php-fpm.conf $finalphpconf
|
|||
sudo chown root: $finalphpconf
|
||||
sudo chmod 644 $finalphpconf
|
||||
|
||||
# Check sql pwd
|
||||
echo $db_pwd > /var/www/spip/tmp/connect.txt
|
||||
|
||||
# Reload Nginx and regenerate SSOwat conf
|
||||
sudo service php5-fpm restart
|
||||
sudo service nginx reload
|
||||
|
|
Loading…
Reference in a new issue