From b75ad8f08ddc823b2e9b30a8eac7d98bb78705c0 Mon Sep 17 00:00:00 2001
From: root <root@myresolver.net>
Date: Mon, 4 Apr 2022 10:33:03 +0000
Subject: [PATCH] Updating file include path to be relative, adding http conf
 files

---
 pwtool.net-le-ssl.conf | 24 ++++++++++++++++++++++++
 pwtool.net.conf        | 22 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pwtool.net-le-ssl.conf
 create mode 100644 pwtool.net.conf

diff --git a/pwtool.net-le-ssl.conf b/pwtool.net-le-ssl.conf
new file mode 100644
index 0000000..d34b397
--- /dev/null
+++ b/pwtool.net-le-ssl.conf
@@ -0,0 +1,24 @@
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+        ServerName pwtool.net
+	ServerAlias www.pwtool.net pwtool.net
+#        Redirect permanent / https://pwtool.net/
+#</VirtualHost>
+
+#<VirtualHost *:443>
+#        ServerName www.pwtool.net pwtool.net
+#        SSLEngine on
+
+        DocumentRoot /var/www/pwtool/html
+        LogLevel warn
+        ErrorLog /var/log/httpd/https-pwtool.net-error_log
+        CustomLog /var/log/httpd/https-pwtool.net-referer_log referer
+        CustomLog /var/log/httpd/https-pwtool.net-agent_log agent
+        CustomLog /var/log/httpd/https-pwtool.net-access_log combined
+
+
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/pwtool.net/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/pwtool.net/privkey.pem
+</VirtualHost>
+</IfModule>
diff --git a/pwtool.net.conf b/pwtool.net.conf
new file mode 100644
index 0000000..1321dc7
--- /dev/null
+++ b/pwtool.net.conf
@@ -0,0 +1,22 @@
+<VirtualHost *:80>
+        ServerName pwtool.net
+	ServerAlias www.pwtool.net pwtool.net
+#        Redirect permanent / https://pwtool.net/
+#</VirtualHost>
+
+#<VirtualHost *:443>
+#        ServerName www.pwtool.net pwtool.net
+#        SSLEngine on
+
+        DocumentRoot /var/www/pwtool/html
+        LogLevel warn
+        ErrorLog /var/log/httpd/https-pwtool.net-error_log
+        CustomLog /var/log/httpd/https-pwtool.net-referer_log referer
+        CustomLog /var/log/httpd/https-pwtool.net-agent_log agent
+        CustomLog /var/log/httpd/https-pwtool.net-access_log combined
+
+RewriteEngine on
+RewriteCond %{SERVER_NAME} =pwtool.net [OR]
+RewriteCond %{SERVER_NAME} =www.pwtool.net
+RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+</VirtualHost>