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

Merge branch 'master' into testing

Browse source
This commit is contained in:
Éric Gaspar 2022-05-17 18:13:36 +02:00 committed by GitHub
commit ce4aad7923
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/app.src
View file

@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_EXTRACT=true SOURCE_EXTRACT=true
SOURCE_FILENAME=

13
conf/nginx.conf
View file

@ -7,14 +7,12 @@ location / {
client_max_body_size 500M; client_max_body_size 500M;
try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; try_files $uri $uri/ index.php;
location ~ \.php$ { location ~ [^/]\.php(/|$) {
if (!-e $request_filename) { fastcgi_split_path_info ^(.+?\.php)(/.*)$;
rewrite ^__PATH__/?(.*)$ __PATH__/index.php?/$1 last;
break;
}
fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-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;
@ -30,7 +28,4 @@ location / {
more_set_headers "Referrer-Policy: no-referrer"; more_set_headers "Referrer-Policy: no-referrer";
more_set_headers "Feature-Policy: autoplay 'none'; camera 'none'; document-domain 'none'; encrypted-media 'none'; fullscreen 'self'; geolocation 'none'; microphone 'none'; midi 'none'; payment 'none'; vr 'none'"; more_set_headers "Feature-Policy: autoplay 'none'; camera 'none'; document-domain 'none'; encrypted-media 'none'; fullscreen 'self'; geolocation 'none'; microphone 'none'; midi 'none'; payment 'none'; vr 'none'";
more_set_headers "Vary: Accept-Encoding"; more_set_headers "Vary: Accept-Encoding";
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
} }

30
scripts/_common.sh
View file

@ -5,12 +5,37 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
nodejs_version=18 nodejs_version=16
YNH_PHP_VERSION="8.0" YNH_PHP_VERSION="8.0"
# dependencies used by the app # dependencies used by the app
pkg_dependencies="zopfli brotli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-xml" pkg_dependencies="brotli \
zopfli \
php-bcmath \
php${YNH_PHP_VERSION}-curl \
php${YNH_PHP_VERSION}-ctype \
php${YNH_PHP_VERSION}-dev \
php${YNH_PHP_VERSION}-dom \
php${YNH_PHP_VERSION}-exif \
php${YNH_PHP_VERSION}-gd \
php${YNH_PHP_VERSION}-gettext \
php${YNH_PHP_VERSION}-fileinfo \
php${YNH_PHP_VERSION}-fpm \
php${YNH_PHP_VERSION}-json \
php${YNH_PHP_VERSION}-intl \
php${YNH_PHP_VERSION}-ldap \
php${YNH_PHP_VERSION}-mbstring \
php${YNH_PHP_VERSION}-opcache \
php${YNH_PHP_VERSION}-mysql \
php${YNH_PHP_VERSION}-imagick \
php${YNH_PHP_VERSION}-phar \
php${YNH_PHP_VERSION}-redis \
php${YNH_PHP_VERSION}-simplexml \
php${YNH_PHP_VERSION}-tokenizer \
php${YNH_PHP_VERSION}-xml \
php${YNH_PHP_VERSION}-xmlwriter \
php${YNH_PHP_VERSION}-zip"
YNH_COMPOSER_VERSION="2.2.7" YNH_COMPOSER_VERSION="2.2.7"
@ -25,4 +50,3 @@ YNH_COMPOSER_VERSION="2.2.7"
#================================================= #=================================================
# FUTURE OFFICIAL HELPERS # FUTURE OFFICIAL HELPERS
#================================================= #=================================================

2
scripts/install
View file

@ -139,9 +139,7 @@ pushd "$final_path"
ynh_secure_remove node_modules ynh_secure_remove node_modules
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
ynh_script_progression --message="Install start..."
ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php"
#sed -i '' 's/utf8mb4_0900_ai_ci/utf8mb4_unicode_ci/g' "$final_path/conf/sql/db.sql"
ynh_exec_as $app php$phpversion bin/install start -q ynh_exec_as $app php$phpversion bin/install start -q
popd popd