diff --git a/platform-rhel9/json-scada-install.sh b/platform-rhel9/json-scada-install.sh index 683ee074..cd44d9e6 100644 --- a/platform-rhel9/json-scada-install.sh +++ b/platform-rhel9/json-scada-install.sh @@ -90,8 +90,13 @@ sudo dnf -y install grafana sudo cp grafana.ini /etc/grafana sudo systemctl enable grafana-server +<<<<<<< HEAD mkdir ../metabase wget https://downloads.metabase.com/v0.49.10/metabase.jar -O ../metabase/metabase.jar +======= +mkdir ~/metabase +wget https://downloads.metabase.com/v0.49.10/metabase.jar -O ~/metabase/metabase.jar +>>>>>>> 91c079cc16d8f300fb2726fc124ba14b0b9e0bee # install nvm to be able to choose a specific nodejs version curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash diff --git a/platform-rhel9/json_scada_http.conf b/platform-rhel9/json_scada_http.conf index 16b29e50..e4f94649 100644 --- a/platform-rhel9/json_scada_http.conf +++ b/platform-rhel9/json_scada_http.conf @@ -4,12 +4,6 @@ keepalive 15; } - # FastCGI server listening on port 9000 - upstream phpbackend { - server 127.0.0.1:9000; - keepalive 15; - } - server { listen 80; server_name localhost; @@ -104,7 +98,7 @@ location ~ .php$ { include ../platform-windows/nginx_php-runtime/conf/fastcgi_params; root "c:/json-scada/src/htdocs/"; - fastcgi_pass phpbackend; + fastcgi_pass php-fpm; fastcgi_keep_conn on; fastcgi_index index.php; fastcgi_read_timeout 10s; diff --git a/platform-rhel9/json_scada_https.conf b/platform-rhel9/json_scada_https.conf index d5df9150..892af72a 100644 --- a/platform-rhel9/json_scada_https.conf +++ b/platform-rhel9/json_scada_https.conf @@ -106,7 +106,7 @@ # location ~ .php$ { # include fastcgi.conf; # root "/home/jsonscada/json-scada/src/htdocs/"; -# fastcgi_pass phpbackend; +# fastcgi_pass php-fpm; # fastcgi_keep_conn on; # fastcgi_index index.php; # fastcgi_read_timeout 10s;