Merge pull request #291 from chef/jcd/post-283-httpd-changes

Merged change 288f2993-6e47-4b9b-9e1d-450144818ed9

From review branch jcd/post-283-httpd-changes into master

Signed-off-by: reset <[email protected]>

plans/httpd/config/httpd.conf

@@ -28,7 +28,7 @@
 # same ServerRoot for multiple httpd daemons, you will need to change at
 # least PidFile.
 #
-ServerRoot "/opt/bldr/pkgs/{{bldr.origin}}/{{bldr.name}}/{{bldr.version}}/{{bldr.release}}"
+ServerRoot "{{pkg.path}}"
 
 #
 # Mutex: Allows you to set the mutex mechanism and mutex file directory
@@ -49,7 +49,7 @@ ServerRoot "/opt/bldr/pkgs/{{bldr.origin}}/{{bldr.name}}/{{bldr.version}}/{{bldr
 # prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
-Listen {{#listen}} {{.}} {{/listen}}
+Listen {{#cfg.listen}} {{.}} {{/cfg.listen}}
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -211,8 +211,8 @@ ServerAdmin [email protected]
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "/opt/bldr/srvc/httpd/data/htdocs"
-<Directory "/opt/bldr/srvc/httpd/data/htdocs">
+DocumentRoot "{{pkg.svc_path}}/data/htdocs"
+<Directory "{{pkg.svc_path}}/data/htdocs">
     #
     # Possible values for the Options directive are "None", "All",
     # or any combination of:
@@ -263,7 +263,7 @@ DocumentRoot "/opt/bldr/srvc/httpd/data/htdocs"
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "/opt/bldr/srvc/httpd/var/logs/error_log"
+ErrorLog "{{pkg.svc_path}}/var/logs/error_log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -292,7 +292,7 @@ LogLevel warn
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "/opt/bldr/srvc/httpd/var/logs/access_log" common
+    CustomLog "{{pkg.svc_path}}/var/logs/access_log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
@@ -328,7 +328,7 @@ LogLevel warn
     # client.  The same rules about trailing "/" apply to ScriptAlias
     # directives as to Alias.
     #
-    ScriptAlias /cgi-bin/ "/opt/bldr/srvc/httpd/data/cgi-bin/"
+    ScriptAlias /cgi-bin/ "{{pkg.svc_path}}/data/cgi-bin/"
 
 </IfModule>
 
@@ -344,7 +344,7 @@ LogLevel warn
 # "/opt/bldr/srvc/httpd/data/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "/opt/bldr/srvc/httpd/data/cgi-bin">
+<Directory "{{pkg.svc_path}}/data/cgi-bin">
     AllowOverride None
     Options None
     Require all granted