Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
provision
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
provision
Commits
d597cfe0
Commit
d597cfe0
authored
Mar 9, 2017
by
Herman van Rink
Committed by
Herman van Rink
Mar 9, 2017
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#2759735
by helmo: Rename apache config files to .conf
parent
0430fa63
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
http/Provision/Config/Apache/server.tpl.php
+16
-4
16 additions, 4 deletions
http/Provision/Config/Apache/server.tpl.php
http/Provision/Config/Http/Site.php
+6
-1
6 additions, 1 deletion
http/Provision/Config/Http/Site.php
provision.api.php
+7
-0
7 additions, 0 deletions
provision.api.php
with
29 additions
and
5 deletions
http/Provision/Config/Apache/server.tpl.php
+
16
−
4
View file @
d597cfe0
...
@@ -17,18 +17,30 @@ NameVirtualHost *:<?php print $http_port; ?>
...
@@ -17,18 +17,30 @@ NameVirtualHost *:<?php print $http_port; ?>
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule rewrite_module modules/mod_rewrite.so
</IfModule>
</IfModule>
<?php
if
(
drush_get_option
(
'provision_apache_conf_suffix'
,
FALSE
))
{
$include_statement
=
'IncludeOptional '
;
$include_suffix
=
'/*.conf'
;
}
else
{
$include_statement
=
'Include '
;
$include_suffix
=
''
;
}
?>
# other configuration, not touched by aegir
# other configuration, not touched by aegir
# this allows you to override aegir configuration, as it is included before
# this allows you to override aegir configuration, as it is included before
Include
<?php
print
$
http_pred_path
?>
<?php
print
$
include_statement
.
$http_pred_path
.
$include_suffix
?>
# virtual hosts
# virtual hosts
Include
<?php
print
$
http_vhostd_path
?>
<?php
print
$
include_statement
.
$http_vhostd_path
.
$include_suffix
?>
# platforms
# platforms
Include
<?php
print
$http_platformd_path
?>
<?php
print
$include_statement
.
$http_platformd_path
.
$include_suffix
?>
# other configuration, not touched by aegir
# other configuration, not touched by aegir
# this allows to have default (for example during migrations) that are eventually overriden by aegir
# this allows to have default (for example during migrations) that are eventually overriden by aegir
Include
<?php
print
$
http_postd_path
?>
<?php
print
$
include_statement
.
$http_postd_path
.
$include_suffix
?>
<?php
print
$extra_config
;
?>
<?php
print
$extra_config
;
?>
This diff is collapsed.
Click to expand it.
http/Provision/Config/Http/Site.php
+
6
−
1
View file @
d597cfe0
...
@@ -11,8 +11,13 @@ class Provision_Config_Http_Site extends Provision_Config_Http {
...
@@ -11,8 +11,13 @@ class Provision_Config_Http_Site extends Provision_Config_Http {
function
filename
()
{
function
filename
()
{
if
(
drush_get_option
(
'provision_apache_conf_suffix'
,
FALSE
))
{
return
$this
->
data
[
'http_vhostd_path'
]
.
'/'
.
$this
->
uri
.
'.conf'
;
}
else
{
return
$this
->
data
[
'http_vhostd_path'
]
.
'/'
.
$this
->
uri
;
return
$this
->
data
[
'http_vhostd_path'
]
.
'/'
.
$this
->
uri
;
}
}
}
function
process
()
{
function
process
()
{
parent
::
process
();
parent
::
process
();
...
...
This diff is collapsed.
Click to expand it.
provision.api.php
+
7
−
0
View file @
d597cfe0
...
@@ -14,8 +14,15 @@
...
@@ -14,8 +14,15 @@
* $options['provision_backup_suffix'] = '.tar.bz2';
* $options['provision_backup_suffix'] = '.tar.bz2';
*
*
* provision_verify_platforms_before_migrate - When migrating many sites turning this off can save time, default TRUE.
* provision_verify_platforms_before_migrate - When migrating many sites turning this off can save time, default TRUE.
*
* provision_backup_suffix - Method to set the compression used for backups... e.g. '.tar.bz2' or '.tar.', defaults to '.tar.gz'.
* provision_backup_suffix - Method to set the compression used for backups... e.g. '.tar.bz2' or '.tar.', defaults to '.tar.gz'.
*
*
* provision_apache_conf_suffix
* Set to TRUE to generate apache vhost files with a .conf suffix, default FALSE.
* This takes advantage of the IncludeOptional statment introduced in Apache 2.3.6.
* WARNING: After turning this on you need to re-verify all your sites, then then servers,
* and then cleanup the old configfiles (those without the .conf suffix).
*
*/
*/
/**
/**
...
...
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