Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
apache
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
webarch
apache
Commits
83a1200b
Commit
83a1200b
authored
6 years ago
by
Chris Croome
Browse files
Options
Downloads
Patches
Plain Diff
fix?
parent
e43315cd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#4396
failed
6 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
templates/webarch.conf.j2
+8
-8
8 additions, 8 deletions
templates/webarch.conf.j2
with
8 additions
and
8 deletions
templates/webarch.conf.j2
+
8
−
8
View file @
83a1200b
...
...
@@ -17,7 +17,7 @@ Alias /wsh.shtml /var/www/wsh/wsh.shtml
# icons for directory index icons
Alias /icons /usr/share/apache2/icons
# env vars for the default index page, wsh.shtml
SetEnv PHPMYADMIN_DOMAIN "{{ hostname }}"
SetEnv PHPMYADMIN_DOMAIN "{{
inventory_
hostname }}"
SetEnv HOME_DOMAIN "webarch.net"
SetEnv SITE_TITLE "Webarchitects Shared Hosting"
SetEnv STATIC_DIR "/wsh/"
...
...
@@ -146,16 +146,16 @@ ErrorDocument 403 /wsh/403.shtml
# The default virtual host for port 80
<VirtualHost *:80>
ServerName {{ hostname }}
{% if hostname_ip.stdout == www_hostname_dig_ip.stdout %}
ServerAlias www.{{ hostname }}
{% endif %}
ServerName {{
inventory_
hostname }}
ServerAlias www.{{
inventory_
hostname }}
AssignUserID www-data www-data
ServerAdmin support@webarch.net
SetEnv PIWIK_SITE_ID "1"
SetEnv PIWIK_SITE_DOMAIN "stats.{{ hostname }}"
SetEnv PIWIK_SITE_DOMAIN "stats.{{
inventory_
hostname }}"
DocumentRoot "/var/www"
#RewriteEngine On
#RewriteRule ^/?phpmyadmin(.*) https://%{SERVER_NAME}/phpmyadmin$1 [R,L]
RedirectPermanent /phpmyadmin https://{{ hostname }}/phpmyadmin
RedirectPermanent /phpmyadmin https://{{
inventory_
hostname }}/phpmyadmin
ErrorLog ${APACHE_LOG_DIR}/wsh-error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/wsh-access.log combined
...
...
@@ -164,12 +164,12 @@ ErrorDocument 403 /wsh/403.shtml
# The default virtual host for port 443
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerName {{ hostname }}
{% if hostname_ip.stdout == www_hostname_dig_ip.stdout %}
ServerAlias www.{{ hostname }}
{% endif %}
ServerName {{
inventory_
hostname }}
ServerAlias www.{{
inventory_
hostname }}
AssignUserID www-data www-data
ServerAdmin support@webarch.net
SetEnv PIWIK_SITE_ID "1"
SetEnv PIWIK_SITE_DOMAIN "stats.{{ hostname }}"
SetEnv PIWIK_SITE_DOMAIN "stats.{{
inventory_
hostname }}"
SSLEngine on
# https://httpd.apache.org/docs/trunk/mod/mod_http2.html
#Protocols h2 http/1.1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment