1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/garradin_ynh.git synced 2024-09-03 18:36:17 +02:00

Merge branch 'testing' into update-to-upstream

This commit is contained in:
Éric Gaspar 2020-08-01 10:18:28 +02:00 committed by GitHub
commit 51e7baba5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions

View file

@ -1,5 +1,6 @@
SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.7.tar.bz2
SOURCE_SUM=659b1e2fada284f76d6a37f592c6e7068eb883bb8361392de207aff79ad53af7 SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.8.tar.bz2
SOURCE_SUM=98aa01b86521ff66dcc951ab6f0eb1915e3cee5dada15ba20c96ab72512f1e83
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.bz2 SOURCE_FORMAT=tar.bz2
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

View file

@ -4,10 +4,11 @@ location __PATH__/ {
# Path to source # Path to source
alias __FINALPATH__/www/ ; alias __FINALPATH__/www/ ;
if ($scheme = http) { if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
} }
# Protecting sensibles urls
location ~ 403 { location ~ 403 {
rewrite ^(.*)$ /include/ redirect; rewrite ^(.*)$ /include/ redirect;
rewrite ^(.*)$ /cache/ redirect; rewrite ^(.*)$ /cache/ redirect;
@ -19,13 +20,17 @@ location __PATH__/ {
rewrite ^(.*)$ /config\.(.*)\.php redirect; rewrite ^(.*)$ /config\.(.*)\.php redirect;
} }
try_files $uri $uri/ index.php /_route.php; # Example PHP configuration (remove if not used)
location __PATH__/ {
index index.php /_route.php; index index.php /_route.php;
try_files $uri $uri/ index.php /_route.php;
}
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
try_files $uri $uri/ /_route.php;
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
fastcgi_index index.php; # fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
@ -35,6 +40,8 @@ location __PATH__/ {
# Increase size limit # Increase size limit
client_max_body_size 2M; client_max_body_size 2M;
# PHP configuration end
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }

View file

@ -6,7 +6,7 @@
"en": "Software to manage association", "en": "Software to manage association",
"fr": "Logiciel libre de gestion d'association" "fr": "Logiciel libre de gestion d'association"
}, },
"version": "0.9.7~ynh1", "version": "0.9.8~ynh3",
"url": "http://garradin.eu/a-propos/", "url": "http://garradin.eu/a-propos/",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"maintainer": { "maintainer": {