YunoHost-Apps/grav_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/grav_ynh.git synced 2024-09-03 19:16:01 +02:00
Code Issues Activity Actions 1

Merge pull request #70 from YunoHost-Apps/testing

Browse source 
Upgrade to v1.7.17
This commit is contained in:
tituspijean 2021-07-15 19:22:28 +02:00 • committed by GitHub
commit bf06aa347f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
A modern open source flat-file CMS
**Shipped version:** 1.7.15~ynh1
**Shipped version:** 1.7.17~ynh1
**Demo:** https://getgrav.org/downloads/themes

2
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Un CMS moderne basé sur des fichiers plats
**Version incluse :** 1.7.15~ynh1
**Version incluse :** 1.7.17~ynh1
**Démo :** https://getgrav.org/downloads/themes

6
check_process
View file

@ -27,6 +27,7 @@
setup_public=1
upgrade=1
upgrade=1 from_commit=12e86653bc6c91208b3abaf4243a7ebb996cada6
upgrade=1 from_commit=7d16d0560c588ad4adcde5b44ae4329f9e40f7c7
backup_restore=1
multi_instance=1
port_already_use=0 (66)
@ -39,4 +40,7 @@ Notification=none
;;; Upgrade options
; commit=12e86653bc6c91208b3abaf4243a7ebb996cada6
name=Upgrade to v1.7.5
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=1&
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=1&
; commit=7d16d0560c588ad4adcde5b44ae4329f9e40f7c7
name=Upgrade to v1.7.17
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=1&

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.15/grav-admin-v1.7.15.zip
SOURCE_SUM=3acd9067720876ffc4c5b0f7c0ac2d495c3b3211d6c2c88cabd20dc18988115a
SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.17/grav-admin-v1.7.17.zip
SOURCE_SUM=434833c6f604ff8ad38f0c58932dbdc99c61b498f16a883dae946017abd286ce
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true

40
conf/nginx.conf
View file

@ -3,10 +3,6 @@ location __PATH__/ {
alias __FINALPATH__/;
index index.php;
if (!-e $request_filename)
{
rewrite ^(.+)$ __PATH__/index.php?q=$1 last;
}
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
@ -20,16 +16,11 @@ location __PATH__/ {
more_set_headers "X-Download-Options: noopen";
more_set_headers "X-Permitted-Cross-Domain-Policies: none";
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;
more_set_headers "Cache-Control: public";
}
location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
# Bug in Nginx with locations and aliases (see http://stackoverflow.com/a/35102259 )
try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string;
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
fastcgi_index index.php;
include fastcgi_params;
@ -40,6 +31,27 @@ location __PATH__/ {
fastcgi_param SCRIPT_FILENAME $request_filename;
}
location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
expires 30d;
more_set_headers "Vary: Accept-Encoding";
log_not_found off;
}
location ~* ^.+\.(?:css|cur|js|jpe?g|gif|htc|ico|png|html|xml|otf|ttf|eot|woff|woff2|svg)$ {
access_log off;
expires 30d;
more_set_headers "Cache-Control: public";
## No need to bleed constant updates. Send the all shebang in one fell swoop.
tcp_nodelay off;
## Set the OS file cache.
open_file_cache max=3000 inactive=120s;
open_file_cache_valid 45s;
open_file_cache_min_uses 2;
open_file_cache_errors off;
}
## Begin - Security
# deny all direct access for these folders
location ~* /(.git|cache|bin|logs|backups)/.*$ { return 403; }

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "A modern open source flat-file CMS",
"fr": "Un CMS moderne basé sur des fichiers plats"
},
"version": "1.7.15~ynh1",
"version": "1.7.17~ynh1",
"url": "https://www.getgrav.org/",
"upstream": {
"license": "MIT",

8
scripts/update_version.sh
View file

@ -79,15 +79,11 @@ EOT
# README and COMMIT
###
sed -i "s#\*\*Shipped version:\*\*.*#\*\*Shipped version:\*\* ${version}#" ../README.md
sed -i "s#\*\*Version incluse :\*\*.*#\*\*Version incluse :\*\* ${version}#" ../README_fr.md
sed -i "s# \"version\": \".*# \"version\": \"${version}\~ynh1\",#" ../manifest.json
# TODO: Run README maker
message="Upgrade to v$version"
if [ "$message" == "$(git show -s --format=%s)" ]; then
git commit ../README.md ../README_fr.md ../manifest.json ../conf/app.src --amend -m "$message"
git commit ../manifest.json ../conf/app.src --amend -m "$message"
else
git commit ../README.md ../README_fr.md ../manifest.json ../conf/app.src -m "$message"
git commit ../manifest.json ../conf/app.src -m "$message"
fi