YunoHost-Apps/galette_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/galette_ynh.git synced 2024-09-03 18:36:28 +02:00
Code Issues Activity Actions

Merge pull request #7 from pp-r/patch-1

Browse source 
Patch 1
This commit is contained in:
Éric Gaspar 2021-01-05 23:11:04 +01:00 • committed by GitHub
commit 2576e1a1c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/app.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://download.tuxfamily.org/galette/galette-0.9.2.1.tar.bz2 SOURCE_URL=https://github.com/galette/galette/archive/0.9.4.2.tar.gz
SOURCE_SUM=d1fb7b75d045574d7fdff6416c1ac543ef3d30280e086fc970e141f4e051281a SOURCE_SUM=20cc417a5870a26b2d18b18940183156906c51989d3a563282b4b58f25d016a2
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.bz2 SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

2
conf/nginx.conf
View file

@ -16,7 +16,7 @@ location __PATH__/ {
try_files $uri $uri/ @galette; try_files $uri $uri/ @galette;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php7.1-fpm-__NAME__.sock; fastcgi_pass unix:/var/run/php__PHPVERSION__-fpm-__NAME__.sock;
fastcgi_index index.php; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;

4
conf/php-fpm.conf
View file

@ -30,7 +30,7 @@ group = __USER__
; specific port; ; specific port;
; '/path/to/unix/socket' - to listen on a unix socket. ; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory. ; Note: This value is mandatory.
listen = /var/run/php7.1-fpm-__NAMETOCHANGE__.sock listen = /var/run/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
; Set listen(2) backlog. A value of '-1' means unlimited. ; Set listen(2) backlog. A value of '-1' means unlimited.
; Default Value: 128 (-1 on FreeBSD and OpenBSD) ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
@ -355,7 +355,7 @@ catch_workers_output = yes
; exectute php code. ; exectute php code.
; Note: set an empty value to allow all extensions. ; Note: set an empty value to allow all extensions.
; Default Value: .php ; Default Value: .php
;security.limit_extensions = .php .php3 .php4 .php5 ;security.limit_extensions = .php .php3 .php4 .php5 .php7
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
; the current environment. ; the current environment.

6
manifest.json
View file

@ -4,13 +4,13 @@
"packaging_format": 1, "packaging_format": 1,
"url": "https://www.galette.eu", "url": "https://www.galette.eu",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"version": "0.9.2.1~ynh1", "version": "0.9.4.2~ynh1",
"requirements": { "requirements": {
"yunohost": ">= 3.6" "yunohost": ">= 3.8.1"
}, },
"services": [ "services": [
"nginx", "nginx",
"php5-fpm", "php7.3-fpm",
"mysql" "mysql"
], ],
"description": { "description": {

16
scripts/_common.sh
View file

@ -5,8 +5,8 @@
#================================================= #=================================================
# dependencies used by the app # dependencies used by the app
php_version="7.1" YNH_PHP_VERSION="7.3"
php_packages="php7.1-tidy php7.1-intl php7.1-mbstring php7.1-mysql php7.1-xml php7.1-gd php7.1-curl" php_packages="php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
#================================================= #=================================================
# EXPERIMENTAL HELPERS # EXPERIMENTAL HELPERS
@ -79,9 +79,9 @@ ynh_install_php () {
# Store php_version into the config of this app # Store php_version into the config of this app
ynh_app_setting_set $app php_version $phpversion ynh_app_setting_set $app php_version $phpversion
if [ "$phpversion" == "7.0" ] if [ "$phpversion" == "7.3" ]
then then
ynh_die "Do not use ynh_install_php to install php7.0" ynh_die "Do not use ynh_install_php to install php7.3"
fi fi
# Store the ID of this app and the version of php requested for it # Store the ID of this app and the version of php requested for it
@ -96,7 +96,7 @@ ynh_install_php () {
ynh_add_app_dependencies --package="php$phpversion php${phpversion}-common $package" ynh_add_app_dependencies --package="php$phpversion php${phpversion}-common $package"
# Set php7.0 back as the default version for php-cli. # Set php7.0 back as the default version for php-cli.
update-alternatives --set php /usr/bin/php7.0 update-alternatives --set php /usr/bin/php7.3
# Remove this extra repository after packages are installed # Remove this extra repository after packages are installed
ynh_remove_extra_repo --name=extra_php_version ynh_remove_extra_repo --name=extra_php_version
@ -109,11 +109,11 @@ ynh_remove_php () {
# Get the version of php used by this app # Get the version of php used by this app
local phpversion=$(ynh_app_setting_get $app php_version) local phpversion=$(ynh_app_setting_get $app php_version)
if [ "$phpversion" == "7.0" ] || [ -z "$phpversion" ] if [ "$phpversion" == "7.3" ] || [ -z "$phpversion" ]
then then
if [ "$phpversion" == "7.0" ] if [ "$phpversion" == "7.3" ]
then then
ynh_print_err "Do not use ynh_remove_php to install php7.0" ynh_print_err "Do not use ynh_remove_php to install php7.3"
fi fi
return 0 return 0
fi fi

2
scripts/restore
View file

@ -109,5 +109,5 @@ ynh_restore_file "/etc/logrotate.d/$app"
# RELOAD NGINX AND PHP-FPM # RELOAD NGINX AND PHP-FPM
#================================================= #=================================================
systemctl reload php7.1-fpm systemctl reload php$phpversion-fpm
systemctl reload nginx systemctl reload nginx