YunoHost-Apps/wallabag2_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/wallabag2_ynh.git synced 2024-10-01 13:35:06 +02:00
Code Issues Activity Actions

[enh] Update Wallabag to v2.1.4

Browse source
This commit is contained in:
Jérôme Lebleu 2016-11-20 19:50:41 +01:00
parent 7d181edb0f
commit 16340deabe
5 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -3,7 +3,7 @@ Wallabag v2 for Yunohost
**This is a work-in-progress Wallabag v2 package for YunoHost.** **This is a work-in-progress Wallabag v2 package for YunoHost.**
**Shipped version:** 2.1.1 **Shipped version:** 2.1.4
[Wallabag](https://www.wallabag.org/) is a self hostable application allowing [Wallabag](https://www.wallabag.org/) is a self hostable application allowing
you to not miss any content anymore. Click, save, read it when you can. It you to not miss any content anymore. Click, save, read it when you can. It

46
conf/nginx.conf
View file

@ -1,24 +1,32 @@
location {LOCATION} { location {LOCATION} {
alias {DESTDIR}/web/; alias {DESTDIR}/web/;
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
index app.php;
try_files $uri @wallabag;
location ~ ^{PATH}/app\.php(?:$|/) {
include fastcgi_params;
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_param REMOTE_USER $remote_user;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_pass unix:/var/run/php5-fpm-{POOLNAME}.sock;
fastcgi_intercept_errors on;
}
# Include SSOWAT user panel. if ($scheme = http) {
include conf.d/yunohost_panel.conf.inc; rewrite ^ https://$server_name$request_uri? permanent;
}
try_files $uri @wallbag2;
location ~ ^{PATH}/app\.php(?:$|/) {
include fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param REMOTE_USER $remote_user;
fastcgi_pass unix:/var/run/php5-fpm-{POOLNAME}.sock;
fastcgi_intercept_errors on;
}
# return 404 for all other php files not matching the front controller
# this prevents access to other php files you don't want to be accessible.
location ~ \.php$ {
return 404;
}
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
} }
location @wallabag { location @wallbag2 {
rewrite ^ {PATH}/app.php?$request_uri; rewrite ^ {PATH}/app.php$is_args$args;
} }

3
conf/parameters.yml
View file

@ -7,6 +7,7 @@ parameters:
database_password: {DBPASS} database_password: {DBPASS}
database_path: null database_path: null
database_table_prefix: null database_table_prefix: null
database_socket: null
mailer_transport: smtp mailer_transport: smtp
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1
@ -37,5 +38,7 @@ parameters:
rabbitmq_password: guest rabbitmq_password: guest
# Redis processing # Redis processing
redis_scheme: tcp
redis_host: localhost redis_host: localhost
redis_port: 6379 redis_port: 6379
redis_path: null

2
manifest.json
View file

@ -8,7 +8,7 @@
}, },
"url": "https://www.wallabag.org", "url": "https://www.wallabag.org",
"license": "MIT", "license": "MIT",
"version": "2.1.1", "version": "2.1.4",
"maintainer": { "maintainer": {
"name": "jerome", "name": "jerome",
"email": "jerome@yunohost.org" "email": "jerome@yunohost.org"

4
scripts/_common.sh
View file

@ -3,7 +3,7 @@
# #
# Wallabag version # Wallabag version
VERSION="2.1.1" VERSION="2.1.4"
# Package name for Wallabag dependencies # Package name for Wallabag dependencies
DEPS_PKG_NAME="wallabag-deps" DEPS_PKG_NAME="wallabag-deps"
@ -12,7 +12,7 @@ DEPS_PKG_NAME="wallabag-deps"
WALLABAG_SOURCE_URL="https://framabag.org/wallabag-release-${VERSION}.tar.gz" WALLABAG_SOURCE_URL="https://framabag.org/wallabag-release-${VERSION}.tar.gz"
# Full Wallabag sources tarball checksum # Full Wallabag sources tarball checksum
WALLABAG_SOURCE_SHA256="59649f777932cd5a0cbc950c57fffbee851cc4222dda5ecbb462900a6e2a7ef2" WALLABAG_SOURCE_SHA256="eb64205a4d7c161527edd08bed22e8dd9799fe8a4130c5964c18cba3a94c9768"
# App package root directory should be the parent folder # App package root directory should be the parent folder
PKGDIR=$(cd ../; pwd) PKGDIR=$(cd ../; pwd)