Skip to content

Commit

Permalink
RHEL9 install script and configs updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
riclolsen committed May 18, 2024
1 parent 1747c96 commit 906bd5f
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 75 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@

# JSON SCADA real time webserver listening on port 8080
upstream jsonscadarealtimewebserver {
server 127.0.0.1:8080;
keepalive 15;
}

# FastCGI server listening on port 9000
upstream phpbackend {
server 127.0.0.1:9000;
keepalive 15;
}

server {
listen 80;
server_name localhost;
Expand All @@ -15,13 +26,11 @@

charset UTF-8;

#access_log ../log/host.access.log combined;

# list of IP addresses with access granted
include nginx_access_control.conf;
include json_scada_access_control.conf;

location / {
root "c:/json-scada/src/htdocs/";
root "/home/jsonscada/json-scada/src/htdocs/";
index index.html;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
## REMOVE FIRST COLUMN HASHTAGS TO ENABLE NGINX HTTPS SERVER!
## Please regenerate ssl certificates:
## Install OpenSSL Light for Windows.
## c:\OpenSSL-Win32\bin\openssl req -config "c:\OpenSSL-Win32\openssl.cnf" -x509 -nodes -sha256 -days 36500 -newkey rsa:4096 -keyout /oshmi/conf/nginx.key -out /oshmi/conf/nginx.crt -extensions v3_req

# server {
# server_name $hostname;
# server_tokens off;

# listen 443 ssl http2;
# ssl_certificate ../../conf/nginx.crt;
# ssl_certificate_key ../../conf/nginx.key;
# ssl_certificate /home/jsonscada/json-scada/conf/nginx.crt;
# ssl_certificate_key /home/jsonscada/json-scada/conf/nginx.key;

# #ssl_client_certificate ../../conf/ca.crt;
# #ssl_client_certificate /home/jsonscada/json-scada/conf/ca.crt;
# #ssl_verify_client on;

# gzip on;
Expand All @@ -27,18 +25,12 @@
# charset UTF-8;
# #charset ISO-8859-1;

# #access_log ../log/host.access.log combined;

# # list of IP addresses with access granted
# include nginx_access_control.conf;
# include json_scada_access_control.conf;

# location / {
# root "c:/json-scada/src/htdocs/";
# root "/home/jsonscada/json-scada/src/htdocs/";
# index index.html;

# # For user authentication (use htpasswd.exe command to manage users):
# # auth_basic "Restricted"; # For Basic Auth
# # auth_basic_user_file "c:/json-scada/conf/.htpasswd"; # For Basic Auth
# }

# location /index.html {
Expand Down Expand Up @@ -106,14 +98,14 @@
# location ~ ^/svg/.+(\.svg|\.js)$ {
# add_header Cache-Control "no-cache, must-revalidate";
# etag on;
# root "c:/json-scada/src/htdocs/";
# root "/home/jsonscada/json-scada/src/htdocs/";
# }

# # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
# #
# location ~ .php$ {
# include ../platform-windows/nginx_php-runtime/conf/fastcgi_params;
# root "c:/json-scada/src/htdocs/";
# include fastcgi.conf;
# root "/home/jsonscada/json-scada/src/htdocs/";
# fastcgi_pass phpbackend;
# fastcgi_keep_conn on;
# fastcgi_index index.php;
Expand Down
54 changes: 0 additions & 54 deletions platform-rhel9/nginx.conf

This file was deleted.

0 comments on commit 906bd5f

Please sign in to comment.