Fix incorrect markup and Apache path bug

web/apache.d/non_ssl.template.erb

@@ -4,7 +4,7 @@
 #  /etc/sympl/apache.d/non_ssl.template.erb.
 #
 #  Any extra Apache configurations can be added as .conf files in
-#  /srv/<% domain %>/config/apache.d/
+#  /srv/<%= domain %>/config/apache.d/
 #  which will be read after the base configuration has been read.
 #  Warning: Ensure these are valid, as you may break Apache!
 #
@@ -95,9 +95,9 @@
   ErrorLog   "<%= domain.log_dir %>/error.log"
   CustomLog  "<%= domain.log_dir %>/access.log" combined
   
-  # Read the directory /srv/<% domain %>/config/apache.d for any other Apache  
+  # Read the directory /srv/<%= domain %>/config/apache.d for any other Apache  
   # configuration files.
-  IncludeOptional /srv/<% domain %>/config/apache.d/*.conf
+  IncludeOptional /srv/<%= domain %>/config/apache.d*/*.conf
   # Ensure these are valid as they will break Apache if they are incorrect!
 
 </VirtualHost>