Skip to content

Commit

Permalink
Moved www-root option out of [apache] part to avoid permanent rebuilds
Browse files Browse the repository at this point in the history
  • Loading branch information
bananos committed Feb 16, 2012
1 parent ede282b commit dfea33c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions buildout-base.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ configure-options =

[apache]
recipe = hexagonit.recipe.cmmi
www-root = ${buildout:directory}/var/www
port = 80
keep-compile-dir = false
url = http://www.apache.org/dist//httpd/httpd-2.2.22.tar.gz
configure-options =
Expand All @@ -211,6 +209,8 @@ output = ${buildout:directory}/etc/supervisord.conf


[apache-conf]
www-root = ${buildout:directory}/var/www
port = 80
recipe = collective.recipe.template
input = ${buildout:directory}/templates/httpd.conf.in
output = ${buildout:directory}/etc/httpd.conf
Expand Down
2 changes: 1 addition & 1 deletion buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ version = 5.3.8
url = http://us3.php.net/get/php-5.3.8.tar.gz/from/ua.php.net/mirror


[apache]
[apache-conf]
# Override default Apache port
port = 8080
# this is your webserver root folder
Expand Down
6 changes: 3 additions & 3 deletions templates/httpd.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ServerRoot ${apache:location}
#
#Listen 12.34.56.78:80
#Listen 12080
Listen ${apache:port}
Listen ${apache-conf:port}

#
# Dynamic Shared Object (DSO) Support
Expand Down Expand Up @@ -108,7 +108,7 @@ ServerAdmin you@example.com
# symbolic links and aliases may be used to point to other locations.
#
#DocumentRoot "/srv/gg/parts/apache/htdocs"
DocumentRoot ${apache:www-root}
DocumentRoot ${apache-conf:www-root}

#
# Each directory to which Apache has access can be configured with respect
Expand Down Expand Up @@ -136,7 +136,7 @@ DocumentRoot ${apache:www-root}
# This should be changed to whatever you set DocumentRoot to.
#

<Directory "${apache:www-root}">
<Directory "${apache-conf:www-root}">
#
# Possible values for the Options directive are "None", "All",
# or any combination of:
Expand Down

0 comments on commit dfea33c

Please sign in to comment.