From 320f41d86c405783d93191842fbc3ec8029af03f Mon Sep 17 00:00:00 2001
From: root <root@suspectdevices.com>
Date: Sun, 10 Jan 2021 09:06:39 -0800
Subject: Update configuration with working examples

---
 etc/apache2/sites-avaliable/gitea.conf | 21 ++++++++++++---------
 etc/gitea/app.ini                      |  9 +++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/etc/apache2/sites-avaliable/gitea.conf b/etc/apache2/sites-avaliable/gitea.conf
index d42e944..8fb59c0 100644
--- a/etc/apache2/sites-avaliable/gitea.conf
+++ b/etc/apache2/sites-avaliable/gitea.conf
@@ -4,22 +4,25 @@ Redirect permanent "/" "https://git.suspectdevices.com/"
 
 <VirtualHost *:443>
 
-    ServerName sandbox.suspectdevices.com
-    SSLEngine on
-    #SSLCertificateFile      /etc/ssl/certs/ssl-cert-snakeoil.pem
-    #SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-    SSLCertificateFile   /etc/letsencrypt/live/git.suspectdevices.com/fullchain.pem
-    SSLCertificateKeyFile   /etc/letsencrypt/live/git.suspectdevices.com/privkey.pem
-
     ServerAdmin don@suspectdevices.com
     ServerName git.suspectdevices.com
     ErrorLog ${APACHE_LOG_DIR}/error.log
     CustomLog ${APACHE_LOG_DIR}/access.log combined
+    SSLProxyEngine on
+    SSLProxyVerify none 
+    SSLProxyCheckPeerCN off
+    SSLProxyCheckPeerName off
+    SSLProxyCheckPeerExpire off
+
+    ProxyPassReverseCookieDomain localhost git.suspectdevices.com
+
+    SSLCertificateFile   /etc/letsencrypt/live/git.suspectdevices.com/fullchain.pem
+    SSLCertificateKeyFile   /etc/letsencrypt/live/git.suspectdevices.com/privkey.pem
 
-	<Proxy *>
+    <Proxy *>
 	 Order allow,deny
 	 Allow from all
-	</Proxy>
+    </Proxy>
 
     ProxyPass / https://127.0.0.1:3000/
     ProxyPassReverse / https://127.0.0.1:3000/
diff --git a/etc/gitea/app.ini b/etc/gitea/app.ini
index ec3e425..ebbb816 100644
--- a/etc/gitea/app.ini
+++ b/etc/gitea/app.ini
@@ -26,11 +26,16 @@ LOG_SQL  = false
 ROOT = /var/lib/gitea/gitea-repositories
 
 [server]
-PROTOCOL         = https
 ROOT_URL         = https://git.suspectdevices.com/
 SSH_DOMAIN       = git.suspectdevices.com
 DOMAIN           = git.suspectdevices.com
 HTTP_PORT        = 3000
+HTTP_ADDR        = localhost
+PROTOCOL         = https
+#CERT_FILE        = /etc/letsencrypt/live/git.suspectdevices.com/fullchain.pem
+#KEY_FILE         = /etc/letsencrypt/live/git.suspectdevices.com/fullchain.pem
+CERT_FILE        = /var/lib/gitea/keys/fullchain.pem
+KEY_FILE         = /var/lib/gitea/keys/privkey.pem
 DISABLE_SSH      = false
 SSH_PORT         = 22
 LFS_START_SERVER = true
@@ -69,7 +74,7 @@ ENABLE_OPENID_SIGNUP = true
 PROVIDER = file
 
 [log]
-MODE                 = console
+MODE                 = file
 LEVEL                = info
 ROOT_PATH            = /var/lib/gitea/log
 REDIRECT_MACARON_LOG = true
-- 
cgit v1.2.3