Commit 3be8c7c7 authored by Karel Hanák's avatar Karel Hanák
Browse files

Merge branch 'feature/local_mender_test' into 'master'

Mender local update, php, nginx update

See merge request !3
parents 39c348a0 fbed51de
......@@ -407,7 +407,7 @@ pm.max_spare_servers = 3
; the current environment.
; Default Value: clean env
;env[HOSTNAME] = $HOSTNAME
;env[PATH] = /usr/local/bin:/usr/bin:/bin
env[PATH] = $PATH
;env[TMP] = /tmp
;env[TMPDIR] = /tmp
;env[TEMP] = /tmp
......
[PHP]
memory_limit=256M
post_max_size=230M
upload_max_filesize=230M
......@@ -16,11 +16,14 @@ PACKAGECONFIG_class-native= "sqlite3 opcache openssl \
SRC_URI_append = " file://iqrf-gateway-webapp.conf \
file://01-run-as-root.patch \
file://php.ini \
"
do_install_append_class-target() {
install -d ${D}${sysconfdir}/php-fpm.d/
install -m 755 ${WORKDIR}/iqrf-gateway-webapp.conf ${D}${sysconfdir}/php-fpm.d/
install -d ${D}${sysconfdir}/php/apache2-php7/
install -m 755 ${WORKDIR}/php.ini ${D}${sysconfdir}/php/apache2-php7/
# creat symlink manually for systemd service
# we cannot inherit systemd because systemd.bbclass contains check which
......@@ -31,4 +34,4 @@ do_install_append_class-target() {
${D}${sysconfdir}/systemd/system/multi-user.target.wants/php-fpm.service
}
FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/* ${sysconfdir}/tmpfiles.d/* ${sysconfdir}/systemd/*"
FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/* ${sysconfdir}/php/apache2-php7/* ${sysconfdir}/tmpfiles.d/* ${sysconfdir}/systemd/*"
......@@ -7,6 +7,7 @@ server {
listen [::]:80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
client_max_body_size 230m;
root /usr/share/iqrf-gateway-webapp/www;
index index.php index.html index.htm index.nginx-debian.html;
......@@ -60,7 +61,7 @@ server {
# Mitigate https://httpoxy.org/ vulnerabilities
fastcgi_param HTTP_PROXY "";
fastcgi_read_timeout 600;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_pass backend;
......
--- a/app/config/features.neon
+++ b/app/config/features.neon
@@ -16,53 +16,53 @@
@@ -16,56 +16,56 @@
# Show documentation
docs:
enabled: true
......@@ -41,6 +41,10 @@
# PIXLA mamagement system
pixla:
- enabled: false
+ enabled: true
# Remount endpoints
remount:
- enabled: false
+ enabled: true
# SSH daemon manager
ssh:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment