templates/httpd/httpd.conf.erb in peony-0.1.9 vs templates/httpd/httpd.conf.erb in peony-0.3.0

@@ -35,11 +35,11 @@
 #
 # Change this to Listen on specific IP addresses as shown below to 
 # prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
-Listen <%= httpd_port %>
+Listen <%= httpd.port %>
 
 #
 # Dynamic Shared Object (DSO) Support
 #
 # To be able to use the functionality of a module which was built as a DSO you
@@ -148,20 +148,20 @@
 #
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. [e-mail]
 #
-ServerAdmin "<%= httpd_server_admin %>"
+ServerAdmin "<%= httpd.server_admin %>"
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
 # This can often be determined automatically, but we recommend you specify
 # it explicitly to prevent problems during startup.
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-ServerName <%= httpd_server_name %>
+ServerName <%= httpd.server_name %>
 
 #
 # DocumentRoot: The directory out of which you will serve your
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
@@ -262,11 +262,11 @@
 # If you do not specify an ErrorLog directive within a <VirtualHost>
 # container, error messages relating to that virtual host will be
 # 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 "<%= httpd_log_dir %>/error.log"
+ErrorLog "<%= httpd.log_dir %>/error.log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
 # Possible values include: debug, info, notice, warn, error, crit,
 # alert, emerg.
@@ -291,11 +291,11 @@
     # If you do not define any access logfiles within a <VirtualHost>
     # container, they will be logged here.  Contrariwise, if you *do*
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "<%= httpd_log_dir %>/access.log" common
+    CustomLog "<%= httpd.log_dir %>/access.log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
@@ -366,11 +366,11 @@
 <IfModule mime_module>
     #
     # TypesConfig points to the file containing the list of mappings from
     # filename extension to MIME-type.
     #
-    TypesConfig <%= httpd_etc_dir %>/mime.types
+    TypesConfig <%= httpd.etc_dir %>/mime.types
 
     #
     # AddType allows you to add to or override the MIME configuration
     # file specified in TypesConfig for specific file types.
     #
@@ -449,11 +449,11 @@
 # included to add extra features or to modify the default configuration of 
 # the server, or you may simply copy their contents here and change as 
 # necessary.
 
 # Server-pool management (MPM specific)
-Include <%= httpd_etc_dir %>/extra/*.conf
+Include <%= httpd.etc_dir %>/extra/*.conf
 
 
 #
 # Note: The following must must be present to support
 #       starting without SSL on platforms with no /dev/random equivalent
@@ -462,6 +462,6 @@
 <IfModule ssl_module>
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
 
-#Include <%= httpd_etc_dir %>/other/*.conf
+#Include <%= httpd.etc_dir %>/other/*.conf