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

fix

Browse source
This commit is contained in:
ericgaspar 2020-09-17 19:35:57 +02:00
parent aa79d9766d
commit c3fbaa7539
No known key found for this signature in database
GPG key ID: 574F281483054D44
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/php-fpm.conf
View file

@ -390,3 +390,6 @@ catch_workers_output = yes
;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_value[error_log] = /var/log/fpm-php.www.log
;php_admin_flag[log_errors] = on ;php_admin_flag[log_errors] = on
;php_admin_value[memory_limit] = 32M ;php_admin_value[memory_limit] = 32M
php_admin_value[open_basedir] = none
php_admin_value[date.timezone] = "__YHTZ__"

2
conf/systemd.service
View file

@ -4,7 +4,7 @@ After=nginx.service network.target local-fs.target postgresql.service
[Service] [Service]
Type=simple Type=simple
User=www-data User=__APP__
WorkingDirectory=__FINALPATH__ WorkingDirectory=__FINALPATH__
ExecStart=/usr/bin/php daemon.php start --url=https://__DOMAIN____PATH__ --port=__PORT__ ExecStart=/usr/bin/php daemon.php start --url=https://__DOMAIN____PATH__ --port=__PORT__
StandardOutput=syslog StandardOutput=syslog

7
scripts/_common.sh
View file

@ -16,7 +16,12 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-curl php
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS
#================================================= #=================================================
undo_sso_patch() {
(
cd $final_path
patch -p1 -R < $YNH_CWD/../sources/patches/app-00-sso-logout.patch
)
}
#================================================= #=================================================
# EXPERIMENTAL HELPERS # EXPERIMENTAL HELPERS
#================================================= #=================================================

9
scripts/install
View file

@ -122,7 +122,8 @@ ynh_system_user_create --username=$app
ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
#ynh_replace_string --match_string="YHTZ" --replace_string="$timezone" --target_file=../conf/php-fpm.conf ynh_replace_string --match_string="__YHTZ__" --replace_string="$timezone" --target_file=../conf/php-fpm.conf
ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
@ -151,7 +152,7 @@ ynh_store_file_checksum --file="$final_path/config/db.inc.php"
cd "$final_path" cd "$final_path"
export COMPOSER_HOME=$final_path export COMPOSER_HOME=$final_path
curl -sS https://getcomposer.org/installer | php -- --install-dir="$final_path" \ curl -sS https://getcomposer.org/installer | php -- --install-dir="$final_path" \
&& php composer.phar install --no-interaction --quiet && php"${phpversion}" composer.phar install --no-interaction --quiet
) )
#================================================= #=================================================
@ -237,9 +238,9 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1
# SSOwat configuration # SSOwat configuration
if [[ "$ssoenabled" = "No" ]]; then if [[ "$ssoenabled" -eq 0 ]]; then
ynh_app_setting_set "$app" skipped_uris "/" ynh_app_setting_set "$app" skipped_uris "/"
(cd "$final_path" && php"${phpversion}" mud.php config --xmppwhitelist="$domain") #(cd "$final_path" && php"${phpversion}" mud.php config --xmppwhitelist="$domain")
undo_sso_patch undo_sso_patch
else else
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"