From 1e463c6638a05a237d660f458f5a147353be3fc1 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 26 May 2017 16:41:51 -0700
Subject: static - support for renewing certs with let's encrypt for static
 sites

---
 puppet/modules/site_static/templates/apache.conf.erb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_static/templates')

diff --git a/puppet/modules/site_static/templates/apache.conf.erb b/puppet/modules/site_static/templates/apache.conf.erb
index dd04ca43..eb21e4c9 100644
--- a/puppet/modules/site_static/templates/apache.conf.erb
+++ b/puppet/modules/site_static/templates/apache.conf.erb
@@ -80,7 +80,9 @@
 ##
 <VirtualHost 127.0.0.1:80>
   ServerName <%= @tor_domain %>
+<%- if @www_alias -%>
   ServerAlias www.<%= @tor_domain %>
+<%- end -%>
 
   <IfModule mod_headers.c>
     Header set X-Frame-Options "deny"
@@ -102,7 +104,9 @@
 ##
 <VirtualHost *:80>
   ServerName <%= @domain %>
-  ServerAlias www.<%= @domain %>
+<%- if @www_alias -%>
+  ServerAlias www.<%= @tor_domain %>
+<%- end -%>
 <%- @aliases && @aliases.each do |domain_alias| -%>
   ServerAlias <%= domain_alias %>
 <%- end -%>
@@ -122,7 +126,9 @@
 ##
 <VirtualHost *:443>
   ServerName <%= @domain %>
-  ServerAlias www.<%= @domain %>
+<%- if @www_alias -%>
+  ServerAlias www.<%= @tor_domain %>
+<%- end -%>
 <%- @aliases && @aliases.each do |domain_alias| -%>
   ServerAlias <%= domain_alias %>
 <%- end -%>
-- 
cgit v1.2.3