From c41ee26a2fc04141556b5a9c6f54a399f58ff7f5 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Thu, 9 Nov 2023 18:08:06 +0800
Subject: [PATCH] fix: web port change to 80, 443

---
 config/etc/default/restconf.yaml |  6 +--
 config/etc/nginx/default         | 91 ++++++++++++++++++++++++++++++++
 config/etc/nginx/omc.conf        |  4 +-
 3 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 config/etc/nginx/default

diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml
index 9d0afc02..6a330b8b 100644
--- a/config/etc/default/restconf.yaml
+++ b/config/etc/default/restconf.yaml
@@ -16,7 +16,7 @@ rest:
     port: 3030
   - ipv4: 0.0.0.0
     ipv6: 
-    port: 4443
+    port: 3443
     schema: https
     caFile: /usr/local/omc/etc/certs/rootca.crt
     certFile: /usr/local/omc/etc/certs/tsa-omc.crt
@@ -26,9 +26,9 @@ webServer:
   enabled: true
   rootDir: /usr/local/omc/htdocs/front
   listen: 
-    - addr: :8080
+    - addr: :80
       schema: http
-    - addr: :8443
+    - addr: :443
       schema: https
       caFile: /usr/local/omc/etc/certs/rootca.crt
       certFile: /usr/local/omc/etc/certs/tsa-omc.crt
diff --git a/config/etc/nginx/default b/config/etc/nginx/default
new file mode 100644
index 00000000..a6f22792
--- /dev/null
+++ b/config/etc/nginx/default
@@ -0,0 +1,91 @@
+##
+# You should look at the following URL's in order to grasp a solid understanding
+# of Nginx configuration files in order to fully unleash the power of Nginx.
+# https://www.nginx.com/resources/wiki/start/
+# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/
+# https://wiki.debian.org/Nginx/DirectoryStructure
+#
+# In most cases, administrators will remove this file from sites-enabled/ and
+# leave it as reference inside of sites-available where it will continue to be
+# updated by the nginx packaging team.
+#
+# This file will automatically load configuration files provided by other
+# applications, such as Drupal or Wordpress. These applications will be made
+# available underneath a path with that package name, such as /drupal8.
+#
+# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
+##
+
+# Default server configuration
+#
+server {
+	listen 1080 default_server;
+	listen [::]:1080 default_server;
+
+	# SSL configuration
+	#
+	# listen 443 ssl default_server;
+	# listen [::]:443 ssl default_server;
+	#
+	# Note: You should disable gzip for SSL traffic.
+	# See: https://bugs.debian.org/773332
+	#
+	# Read up on ssl_ciphers to ensure a secure configuration.
+	# See: https://bugs.debian.org/765782
+	#
+	# Self signed certs generated by the ssl-cert package
+	# Don't use them in a production server!
+	#
+	# include snippets/snakeoil.conf;
+
+	root /var/www/html;
+
+	# Add index.php to the list if you are using PHP
+	index index.html index.htm index.nginx-debian.html;
+
+	server_name _;
+
+	location / {
+		# First attempt to serve request as file, then
+		# as directory, then fall back to displaying a 404.
+		try_files $uri $uri/ =404;
+	}
+
+	# pass PHP scripts to FastCGI server
+	#
+	#location ~ \.php$ {
+	#	include snippets/fastcgi-php.conf;
+	#
+	#	# With php-fpm (or other unix sockets):
+	#	fastcgi_pass unix:/run/php/php7.4-fpm.sock;
+	#	# With php-cgi (or other tcp sockets):
+	#	fastcgi_pass 127.0.0.1:9000;
+	#}
+
+	# deny access to .htaccess files, if Apache's document root
+	# concurs with nginx's one
+	#
+	#location ~ /\.ht {
+	#	deny all;
+	#}
+}
+
+
+# Virtual Host configuration for example.com
+#
+# You can move that to a different file under sites-available/ and symlink that
+# to sites-enabled/ to enable it.
+#
+#server {
+#	listen 80;
+#	listen [::]:80;
+#
+#	server_name example.com;
+#
+#	root /var/www/example.com;
+#	index index.html;
+#
+#	location / {
+#		try_files $uri $uri/ =404;
+#	}
+#}
diff --git a/config/etc/nginx/omc.conf b/config/etc/nginx/omc.conf
index 07311434..5eebc396 100644
--- a/config/etc/nginx/omc.conf
+++ b/config/etc/nginx/omc.conf
@@ -1,6 +1,6 @@
 server {
-    listen                             443 ssl;
-    listen                             [::]:443 ssl;
+    listen                             4443 ssl;
+    listen                             [::]:4443 ssl;
     server_name                        0.0.0.0;
     root /usr/local/omc/htdocs/front/;
     index index.html index.htm;