Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sympl
Sympl
Commits
3be47877
Commit
3be47877
authored
Sep 09, 2020
by
Paul Cammish
Browse files
Make the config directory optional, as well as the apache.d directory.
parent
4d123243
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
web/apache.d/non_ssl.template.erb
View file @
3be47877
...
...
@@ -97,7 +97,7 @@
# Read the directory /srv/
<%=
domain
%>
/config/apache.d for any other Apache
# configuration files.
IncludeOptional /srv/
<%=
domain
%>
/
c
onfig/[a]pache.d/*.conf
IncludeOptional /srv/
<%=
domain
%>
/
[c]
onfig/[a]pache.d/*.conf
# Ensure these are valid as they will break Apache if they are incorrect!
</VirtualHost>
...
...
web/apache.d/ssl.template.erb
View file @
3be47877
...
...
@@ -122,7 +122,7 @@
# Read the directory /srv/
<%=
domain
%>
/config/apache.d for any other Apache
# configuration files.
IncludeOptional /srv/
<%=
domain
%>
/
c
onfig/[a]pache.d/*.conf
IncludeOptional /srv/
<%=
domain
%>
/
[c]
onfig/[a]pache.d/*.conf
# Ensure these are valid as they will break Apache if they are incorrect!
</VirtualHost>
...
...
@@ -226,7 +226,7 @@
# Read the directory /srv/
<%=
domain
%>
/config/apache.d for any other Apache
# configuration files.
IncludeOptional /srv/
<%=
domain
%>
/
c
onfig/[a]pache.d/*.conf
IncludeOptional /srv/
<%=
domain
%>
/
[c]
onfig/[a]pache.d/*.conf
# Ensure these are valid as they will break Apache if they are incorrect!
</VirtualHost>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment