From e6fd9b5da8ca286b2651302c5173899e20270d92 Mon Sep 17 00:00:00 2001
From: adminbruno <bruno@1nfo.services>
Date: Mon, 18 Jul 2022 11:36:49 -0400
Subject: [PATCH] iup

---
 nginx-conf/osticket.conf | 48 +++++++++++++++++++++++++++++
 osticket-install.sh      | 66 +---------------------------------------
 2 files changed, 49 insertions(+), 65 deletions(-)
 create mode 100644 nginx-conf/osticket.conf

diff --git a/nginx-conf/osticket.conf b/nginx-conf/osticket.conf
new file mode 100644
index 0000000..f69debd
--- /dev/null
+++ b/nginx-conf/osticket.conf
@@ -0,0 +1,48 @@
+server {
+        listen 80;
+        server_name tickets.noc.1nfo.services;
+        rewrite ^ https://tickets.mydomain.com permanent;
+	}
+server {
+        listen 443;
+        server_name tickets.1nfo.services;
+        ssl on;
+        ssl_certificate /etc/nginx/certs/cert.pem;
+        ssl_certificate_key /etc/nginx/certs/cert.key;
+        keepalive_timeout 70;
+        root /var/www/osticket;
+        set \$path_info "";
+        location ~ /include {
+            deny all;
+            return 403;
+        }
+        if (\$request_uri ~ "^/api(/[^\?]+)") {
+            set \$path_info \$1;
+        }
+        location ~ ^/api/(?:tickets|tasks).*$ {
+            try_files \$uri \$uri/ /api/http.php?\$query_string;
+        }
+        if (\$request_uri ~ "^/scp/.*\.php(/[^\?]+)") {
+            set \$path_info \$1;
+        }
+        if (\$request_uri ~ "^/.*\.php(/[^\?]+)") {
+            set \$path_info \$1;
+        }
+        location ~ ^/scp/ajax.php/.*$ {
+            try_files \$uri \$uri/ /scp/ajax.php?\$query_string;
+        }
+        location ~ ^/ajax.php/.*$ {
+            try_files \$uri \$uri/ /ajax.php?\$query_string;
+        }
+        location / {
+            try_files \$uri \$uri/ index.php;
+        }
+        location ~ \.php$ {
+            try_files      \$uri = 404;
+            fastcgi_param  SCRIPT_FILENAME  \$document_root\$fastcgi_script_name;
+            include        fastcgi_params;
+            fastcgi_param  PATH_INFO        \$path_info;
+            fastcgi_pass   127.0.0.1:8888;
+        }
+	}
+
diff --git a/osticket-install.sh b/osticket-install.sh
index f1820a3..61803c1 100644
--- a/osticket-install.sh
+++ b/osticket-install.sh
@@ -20,71 +20,7 @@ cd ~
 dnf -y in php php-mysqli php-gd php-gettext php-json php-mbstring php-xml php-pecl-apcu mariadb-server mariadb nginx php-fpm git && \
 \
 \
-cat << EOF > /etc/nginx/conf.d/osticket
-   # Rewrite all requests from HTTP to HTTPS
-    server {
-        listen 80;
-        server_name tickets.noc.1nfo.services;
-        rewrite ^ https://tickets.mydomain.com permanent;
-    }
-
-    server {
-        listen 443;
-        server_name tickets.1nfo.services;
-        ssl on;
-        ssl_certificate /etc/nginx/certs/cert.pem;
-        ssl_certificate_key /etc/nginx/certs/cert.key;
-
-        keepalive_timeout 70;
-
-        root /var/www/osticket;
-
-        set \$path_info "";
-
-        location ~ /include {
-            deny all;
-            return 403;
-        }
-
-        if (\$request_uri ~ "^/api(/[^\?]+)") {
-            set \$path_info \$1;
-        }
-
-        location ~ ^/api/(?:tickets|tasks).*$ {
-            try_files \$uri \$uri/ /api/http.php?\$query_string;
-        }
-
-        if (\$request_uri ~ "^/scp/.*\.php(/[^\?]+)") {
-            set \$path_info \$1;
-        }
-
-        if (\$request_uri ~ "^/.*\.php(/[^\?]+)") {
-            set \$path_info \$1;
-        }
-
-        location ~ ^/scp/ajax.php/.*$ {
-            try_files \$uri \$uri/ /scp/ajax.php?\$query_string;
-        }
-
-        location ~ ^/ajax.php/.*$ {
-            try_files \$uri \$uri/ /ajax.php?\$query_string;
-        }
-
-        location / {
-            try_files \$uri \$uri/ index.php;
-        }
-
-        location ~ \.php$ {
-            try_files      \$uri = 404;
-            fastcgi_param  SCRIPT_FILENAME  \$document_root\$fastcgi_script_name;
-            include        fastcgi_params;
-            fastcgi_param  PATH_INFO        \$path_info;
-            fastcgi_pass   127.0.0.1:8888;
-        }
-    }
-}
-
-EOF && \
+cp nginx-conf/osticket.conf /etc/nginx/conf.d/. && \
 \
 \
 systemctl enable --now mariadb && \