From c78dbd8e9fe65b7a398e676b3af1ceabf101ebe1 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Tue, 19 Feb 2019 16:10:55 +0000 Subject: [PATCH] Pointing chat command at localhost now --- roles/shell/files/chat | 2 +- .../thunix.tilde.chat-le-ssl.conf | 17 +++++++++++++++++ .../sites-available/thunix.tilde.chat.conf | 11 +++++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf diff --git a/roles/shell/files/chat b/roles/shell/files/chat index 5bbec92..35d4130 100755 --- a/roles/shell/files/chat +++ b/roles/shell/files/chat @@ -1,3 +1,3 @@ #!/bin/bash -weechat-curses -r "/set irc.look.temporary_servers on; /connect irc://`whoami`@irc.tilde.chat:6697/#thunix -ssl" +weechat-curses -r "/set irc.look.temporary_servers on; /connect irc://`whoami`@locahost:6667/#thunix" diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf new file mode 100644 index 0000000..326111d --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf @@ -0,0 +1,17 @@ + + + ServerAdmin webmaster@thunix.net + ServerName thunix.tilde.chat + DocumentRoot /var/www/thunix.cf + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + + +SSLCertificateFile /etc/letsencrypt/live/thunix.tilde.chat/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/thunix.tilde.chat/privkey.pem +Include /etc/letsencrypt/options-ssl-apache.conf + + diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf index f42c1a7..a6741e0 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf @@ -1,7 +1,14 @@ - ServerAdmin webmaster@thunix.net + ServerAdmin webmaster@thunix.net ServerName thunix.tilde.chat - DocumentRoot /var/www/thunix/chat + DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + +RewriteEngine on +RewriteCond %{SERVER_NAME} =thunix.tilde.chat +RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]