YunoHost-Apps/spip_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/spip_ynh.git synced 2024-09-03 20:25:59 +02:00
Code Issues Activity Actions

Petites corrections

Browse source
This commit is contained in:
magikcypress 2015-04-28 17:54:25 +02:00
parent 468b760e91
commit cf5beade4f
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/nginx.conf
View file

@ -11,7 +11,7 @@ location PATHTOCHANGE {
client_max_body_size 30m; client_max_body_size 30m;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass unix:/var/run/php5-fpm-spip.sock;
fastcgi_index spip.php; fastcgi_index spip.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;

2
conf/nginx.conf-public
View file

@ -8,7 +8,7 @@ location PATHTOCHANGE {
client_max_body_size 30m; client_max_body_size 30m;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass unix:/var/run/php5-fpm-spip.sock;
fastcgi_index spip.php; fastcgi_index spip.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;

1
manifest.json
View file

@ -11,6 +11,7 @@
"email": "cyp@rouquin.me", "email": "cyp@rouquin.me",
"url": "http://rouquin.me" "url": "http://rouquin.me"
}, },
"url": "http://www.spip.net/",
"multi_instance": "true", "multi_instance": "true",
"arguments": { "arguments": {
"install" : [ "install" : [

19
scripts/install
View file

@ -1,6 +1,21 @@
#!/bin/bash
# Retrieve arguments # Retrieve arguments
domain=$1 domain=$1
path=$2 path=$2
admin_spip=$3
language=$4
is_public=$5
# 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
sudo yunohost app setting spip language -v $language
sudo yunohost app setting spip is_public -v $is_public
# Check domain/path availability # Check domain/path availability
sudo yunohost app checkurl $domain$path -a spip sudo yunohost app checkurl $domain$path -a spip
@ -9,10 +24,9 @@ if [[ ! $? -eq 0 ]]; then
fi fi
# Generate random DES key & password # Generate random DES key & password
deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p')
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') 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')
# Use 'roundcube' as database name and user # Use 'spip' as database name and user
db_user=spip db_user=spip
# Initialize database and store mysql password for upgrade # Initialize database and store mysql password for upgrade
@ -33,4 +47,5 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/spip.conf
# Reload Nginx and regenerate SSOwat conf # Reload Nginx and regenerate SSOwat conf
sudo service nginx reload sudo service nginx reload
sudo yunohost app setting spip skipped_uris -v "/"
sudo yunohost app ssowatconf sudo yunohost app ssowatconf