summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2023-07-14 16:04:42 -0300
committerSilvio Rhatto <rhatto@riseup.net>2023-07-14 16:04:42 -0300
commitd51ee6805db3463044c71db99fba5cfb3e83c536 (patch)
tree3418cb32efdfac89c0694c981aff9c8a312c1e11 /templates
parent698dd51a63382d435857e6e41ded9d929fc0f92e (diff)
downloadpuppet-apache-d51ee6805db3463044c71db99fba5cfb3e83c536.tar.gz
puppet-apache-d51ee6805db3463044c71db99fba5cfb3e83c536.tar.bz2
Allow for VirtualHosts in other ports
Diffstat (limited to 'templates')
-rw-r--r--templates/default.erb3
-rw-r--r--templates/site.erb2
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/default.erb b/templates/default.erb
index 9bfd2b8..3d6baaf 100644
--- a/templates/default.erb
+++ b/templates/default.erb
@@ -26,5 +26,6 @@
#
# For additional details, check
# https://gitlab.torproject.org/tpo/onion-services/onion-support/-/issues/30
-<VirtualHost 127.0.0.1:80>
+Listen 81
+<VirtualHost 127.0.0.1:81>
</VirtualHost>
diff --git a/templates/site.erb b/templates/site.erb
index 3bb32a2..a8ad894 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -1,5 +1,5 @@
# begin vhost for <%= @title %>
-<VirtualHost <%= @listen %>:<%= scope.lookupvar('apache::http_port') %>>
+<VirtualHost <%= @listen %>:<%= @port %>>
ServerName <%= @title %>.<%= @hosting_domain %>
<% if @server_alias != false %> ServerAlias <%= @server_alias %><% end %>
DocumentRoot <%= @docroot %>