commit 7883c7808338b554e18c5e11e03a4da6b8493192
Author: dsorber <david.sorber@gmail.com>
Date:   Wed Feb 12 17:22:32 2014 -0500

    Updating Apache configs, also adding new config for baikal.

diff --git a/configs/apache/baikal.conf b/configs/apache/baikal.conf
new file mode 100644
index 0000000..2524508
--- /dev/null
+++ b/configs/apache/baikal.conf
@@ -0,0 +1,12 @@
+Alias /calendar /var/www/baikal/html
+Alias /calendar/ /var/www/baikal/html/
+
+<Directory "/var/www/baikal">
+	Options -Indexes
+</Directory>
+
+<Directory "/var/www/baikal/html">
+        Options None
+        Options +FollowSymlinks
+        AllowOverride All
+</Directory>
diff --git a/configs/apache/main.conf b/configs/apache/main.conf
index bf6c032..a5f1999 100644
--- a/configs/apache/main.conf
+++ b/configs/apache/main.conf
@@ -13,28 +13,26 @@
         <Directory /var/www/>
                 Options Indexes FollowSymLinks MultiViews
                 AllowOverride None
-                Order allow,deny
-                Allow from all
+		Require all granted
         </Directory>
 
         Alias /htdocs /var/htdocs
         <Directory /var/htdocs>
-                Order allow,deny
-                Allow from all
+		Require all granted
         </Directory>
 
-        WSGIScriptAlias /bfcs /home/dsorber/bfcs/app.wsgi
+        #WSGIScriptAlias /bfcs /home/dsorber/bfcs/app.wsgi
 	
 	ErrorDocument 403 /error_pages/404.html
 	ErrorDocument 404 /error_pages/404.html
 
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
         ErrorLog ${APACHE_LOG_DIR}/error.log
 
         # Possible values include: debug, info, notice, warn, error, crit,
         # alert, emerg.
         LogLevel warn
 
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
 	SSLEngine On
 	SSLCertificateFile /etc/apache2/ssl/server.crt
 	SSLCertificateKeyFile /etc/apache2/ssl/server.key
diff --git a/configs/apache/trac.conf b/configs/apache/trac.conf
index 9d01306..1e02b65 100644
--- a/configs/apache/trac.conf
+++ b/configs/apache/trac.conf
@@ -2,8 +2,7 @@ WSGIScriptAlias /trac /home/dsorber/trac/projects/headquarters/trac.wsgi
 
 <Directory /home/dsorber/trac/projects/headquarters/>
     	WSGIApplicationGroup %{GLOBAL}
-    	Order deny,allow
-    	Allow from all
+    	Require all granted
 </Directory>
 
 <Location "/trac/login">
@@ -18,6 +17,5 @@ Alias /trac/chrome/common /home/dsorber/trac/projects/headquarters/htdocs/common
 Alias /trac/chrome/site /home/dsorber/trac/projects/headquarters/htdocs/site
 
 <Directory "/home/dsorber/trac/projects/headquarters/htdocs">
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>