diff --git a/conf/app.src b/conf/app.src index 6bbc6b8..d4aaf50 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true SOURCE_EXTRACT=true +SOURCE_FILENAME= \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index c2b43ab..3b07b7c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,14 +7,12 @@ location / { client_max_body_size 500M; - try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string; + try_files $uri $uri/ index.php; - location ~ \.php$ { - if (!-e $request_filename) { - rewrite ^__PATH__/?(.*)$ __PATH__/index.php?/$1 last; - break; - } + 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; fastcgi_param REMOTE_USER $remote_user; @@ -30,7 +28,4 @@ location / { 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 "Vary: Accept-Encoding"; - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; } diff --git a/scripts/_common.sh b/scripts/_common.sh index 27fe4c2..1a8d1c2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,12 +5,37 @@ # COMMON VARIABLES #================================================= -nodejs_version=18 +nodejs_version=16 YNH_PHP_VERSION="8.0" # 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" @@ -25,4 +50,3 @@ YNH_COMPOSER_VERSION="2.2.7" #================================================= # FUTURE OFFICIAL HELPERS #================================================= - diff --git a/scripts/install b/scripts/install index 4fd0fe7..1d08ca6 100644 --- a/scripts/install +++ b/scripts/install @@ -135,13 +135,11 @@ pushd "$final_path" ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run buildall ynh_composer_exec --commands="install --prefer-dist --no-cache --no-progress --no-dev -a" - + ynh_secure_remove node_modules 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" - #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 popd