From b3221b0f072e26bf4ffa9ab1141326f699c961f0 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 11 Dec 2014 14:15:39 +0000
Subject: Rename apache.conf to httpd.conf

---
 etc/apache/apache.conf | 54 --------------------------------------------------
 etc/apache/httpd.conf  | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 etc/apache/apache.conf
 create mode 100644 etc/apache/httpd.conf

(limited to 'etc')

diff --git a/etc/apache/apache.conf b/etc/apache/apache.conf
deleted file mode 100644
index 19c28d5..0000000
--- a/etc/apache/apache.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-ServerRoot /usr/lib/apache2
-ServerName www.randomdan.homeip.net
-ServerAdmin dan.goodliffe@randomdan.homeip.net
-PidFile /var/run/apache2.pid
-ErrorLog /var/log/apache2/error.log
-LogFormat "%h %u %t %V \"%r\" %>s %b" common
-CustomLog /var/log/apache2/access.log common
-LogLevel warn
-User apache
-Group web
-Listen 80
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-ServerSignature On
-
-LoadModule access_module modules/mod_access.so
-LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule cgid_module modules/mod_cgid.so
-LoadModule vhost_alias_module modules/mod_vhost_alias.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule php5_module modules/libphp5.so
-LoadModule mod_xslt modules/mod_xslt.so
-LoadModule deflate_module modules/mod_deflate.so
-LoadModule ldap_module modules/mod_ldap.so
-LoadModule auth_ldap_module modules/mod_auth_ldap.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule env_module modules/mod_env.so
-LoadModule rewrite_module modules/mod_rewrite.so
-
-<Directory />
-        Options FollowSymLinks Indexes ExecCGI
-        AllowOverride All
-</Directory>
-
-DirectoryIndex index.php index.html index.xml index.htm index.xphp index.cgi
-VirtualDocumentRoot /var/www/vhosts/%0/
-AccessFileName .htaccess
-AddOutputFilterByType DEFLATE text/html text/plain text/xml
-UseCanonicalName Off
-DefaultType text/plain
-HostnameLookups Off
-AddHandler cgi-script .cgi
-AddOutputFilterByType mod_xslt text/xml
-
-ScriptLog /var/www/files/script.log
-AddType application/x-httpd-php .php
-AddType application/x-httpd-php .xphp
-AddType text/xsl .xsl
-AddType text/xml .xml
diff --git a/etc/apache/httpd.conf b/etc/apache/httpd.conf
new file mode 100644
index 0000000..19c28d5
--- /dev/null
+++ b/etc/apache/httpd.conf
@@ -0,0 +1,54 @@
+ServerRoot /usr/lib/apache2
+ServerName www.randomdan.homeip.net
+ServerAdmin dan.goodliffe@randomdan.homeip.net
+PidFile /var/run/apache2.pid
+ErrorLog /var/log/apache2/error.log
+LogFormat "%h %u %t %V \"%r\" %>s %b" common
+CustomLog /var/log/apache2/access.log common
+LogLevel warn
+User apache
+Group web
+Listen 80
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+ServerSignature On
+
+LoadModule access_module modules/mod_access.so
+LoadModule mime_magic_module modules/mod_mime_magic.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule cgi_module modules/mod_cgi.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule php5_module modules/libphp5.so
+LoadModule mod_xslt modules/mod_xslt.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule ldap_module modules/mod_ldap.so
+LoadModule auth_ldap_module modules/mod_auth_ldap.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule env_module modules/mod_env.so
+LoadModule rewrite_module modules/mod_rewrite.so
+
+<Directory />
+        Options FollowSymLinks Indexes ExecCGI
+        AllowOverride All
+</Directory>
+
+DirectoryIndex index.php index.html index.xml index.htm index.xphp index.cgi
+VirtualDocumentRoot /var/www/vhosts/%0/
+AccessFileName .htaccess
+AddOutputFilterByType DEFLATE text/html text/plain text/xml
+UseCanonicalName Off
+DefaultType text/plain
+HostnameLookups Off
+AddHandler cgi-script .cgi
+AddOutputFilterByType mod_xslt text/xml
+
+ScriptLog /var/www/files/script.log
+AddType application/x-httpd-php .php
+AddType application/x-httpd-php .xphp
+AddType text/xsl .xsl
+AddType text/xml .xml
-- 
cgit v1.2.3