Merge pull request #131 from hyperair/enable-ssl

Enable SSL in apache config

Author: robertsky

apache/punch.hackerspace.sg.conf

@@ -1,18 +1,23 @@
 <VirtualHost *:80>
     ServerName www.hackerspace.sg
-    Redirect permanent / http://hackerspace.sg/
+    ServerAlias hackerspace.sg
+    ServerAlias punch.beta.hackerspace.sg
+    Redirect permanent / https://hackerspace.sg/
 </VirtualHost>
 
-
-<VirtualHost *:80>
-	ServerAdmin webmaster@hackerspace.sg
-	ServerName hackerspace.sg
-	ServerAlias punch.beta.hackerspace.sg
-	DocumentRoot /var/www/punch/www
-	<Directory /var/www/punch/www>
-		Options +FollowSymlinks +ExecCGI
-		AllowOverride All
-	</Directory>
-	ErrorLog ${APACHE_LOG_DIR}/punch.error.log
-	CustomLog ${APACHE_LOG_DIR}/punch.access.log combined
+<VirtualHost *:443>
+    ServerAdmin webmaster@hackerspace.sg
+    ServerName hackerspace.sg
+    ServerAlias punch.beta.hackerspace.sg
+    DocumentRoot /var/www/punch/www
+    <Directory /var/www/punch/www>
+	Options +FollowSymlinks +ExecCGI
+	AllowOverride All
+    </Directory>
+    ErrorLog ${APACHE_LOG_DIR}/punch.error.log
+    CustomLog ${APACHE_LOG_DIR}/punch.access.log combined
+    SSLCertificateFile /etc/letsencrypt/live/hackerspace.sg/cert.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/hackerspace.sg/privkey.pem
+    Include /etc/letsencrypt/options-ssl-apache.conf
+    SSLCertificateChainFile /etc/letsencrypt/live/hackerspace.sg/chain.pem
 </VirtualHost>