From 88bda10d75bdf5a6e8038e8be688aac15fbab698 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Mon, 18 Apr 2022 08:52:08 +0100
Subject: [PATCH] format conf default proxies

---
 conf.d/fet.at/default.conf        |  4 +++-
 conf.d/fet.at/jenkins.conf        | 10 +++++-----
 conf.d/fet.at/juri.conf           |  6 ++++--
 conf.d/luna.fet.at/portainer.conf |  9 ++++++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/conf.d/fet.at/default.conf b/conf.d/fet.at/default.conf
index 62d452c..7337895 100644
--- a/conf.d/fet.at/default.conf
+++ b/conf.d/fet.at/default.conf
@@ -1,9 +1,11 @@
 server {
     listen 443 ssl;
+    include ssl.conf;
+    
     server_name fet.at;
     set $proxy_host triton20;
     set $proxy_port 8080;
-    include ssl.conf;
+
     include default_proxy.conf;
     proxy_set_header Host fet.at;
 }
diff --git a/conf.d/fet.at/jenkins.conf b/conf.d/fet.at/jenkins.conf
index ce8b364..b2d0793 100644
--- a/conf.d/fet.at/jenkins.conf
+++ b/conf.d/fet.at/jenkins.conf
@@ -1,11 +1,11 @@
-
 server {
-    listen 443 ssl ;
-    server_name jenkins.fet.at;
+    listen 443 ssl;
     include ssl.conf;
-    set $proxy_host trition20;
+    
+    server_name jenkins.fet.at;
+    set $proxy_host triton20;
     set $proxy_port 49155;
+
     include default_proxy.conf;
- 
 }
 
diff --git a/conf.d/fet.at/juri.conf b/conf.d/fet.at/juri.conf
index 33631e9..53320cf 100644
--- a/conf.d/fet.at/juri.conf
+++ b/conf.d/fet.at/juri.conf
@@ -1,8 +1,10 @@
 server {
     listen 443 ssl;
+    include ssl.conf;
+    
     server_name juri.fet.at;
     set $proxy_host juri;
     set $proxy_port 80;
-    include ssl.conf;
-    include internal_proxy.conf;
+
+    include default_proxy.conf;
 }
\ No newline at end of file
diff --git a/conf.d/luna.fet.at/portainer.conf b/conf.d/luna.fet.at/portainer.conf
index 1feb15d..4e590b9 100644
--- a/conf.d/luna.fet.at/portainer.conf
+++ b/conf.d/luna.fet.at/portainer.conf
@@ -1,8 +1,11 @@
 server {
     listen 443 ssl;
+    include ssl.conf;
+    
     server_name portainer.luna.fet.at;
     set $proxy_host portainer;
     set $proxy_port 9000;
-    include ssl.conf;
-    include internal_proxy.conf;
-}
\ No newline at end of file
+
+    include default_proxy.conf;
+}
+