Fix apache and support Debian 7.x

README.md

@@ -3,7 +3,7 @@ Synthesize
 
 Installing Graphite doesn't have to be difficult. The `install` script in synthesize is designed to make it brain-dead easy to install Graphite and related services onto a modern Linux distribution.
 
-Synthesize is built to run on Ubuntu 13.10. It will __not__ run on other Ubuntu releases or Linux distributions. The goal of this project is not to become an automation alternative to modern configuration management utilities (e.g. Chef or Puppet), but rather, to make it as easy as possible for the beginner Graphite user to get started and familiar with the project without having to learn a suite of other automation and/or infrastructure-related projects.
+Synthesize is built to run on Ubuntu 13.10 and Debian 7.x. It will __not__ run on other Ubuntu releases or Linux distributions. The goal of this project is not to become an automation alternative to modern configuration management utilities (e.g. Chef or Puppet), but rather, to make it as easy as possible for the beginner Graphite user to get started and familiar with the project without having to learn a suite of other automation and/or infrastructure-related projects.
 
 The resulting Graphite server __listens only on https port 443__ and has been configured to collect metrics specifically for helping profile the performance of your Graphite and Carbon services. It uses memcached for improved query performance, and Statsite for a fast, C-based implementation of the StatsD collector/aggregator.
 
@@ -15,7 +15,7 @@ The resulting Graphite server __listens only on https port 443__ and has been co
 
 ## Dependencies
 
-* An Ubuntu 13.10 VM or server
+* An Ubuntu 13.10 or Debian 7.x VM/server
 * Some mechanism for downloading Synthesize
 
 ## Installation

install

@@ -10,8 +10,9 @@ GRAPHITE_CONF="${GRAPHITE_HOME}/conf"
 GRAPHITE_STORAGE="${GRAPHITE_HOME}/storage"
 
 if [[ ! $UBUNTU_RELEASE =~ 'Ubuntu 13.10' ]]; then
-  echo "Sorry, this is only supported for Ubuntu Linux 13.10."
-  exit 1
+	GRAPHITE_CONF_FILE="graphite"
+else
+	GRAPHITE_CONF_FILE="graphite.conf"
 fi
 if [[ -d $GRAPHITE_HOME ]]; then
   echo "Looks like you already have a Graphite installation in ${GRAPHITE_HOME}, aborting."
@@ -40,13 +41,12 @@ mkdir ${GRAPHITE_CONF}/examples
 mv ${GRAPHITE_CONF}/*.example ${GRAPHITE_CONF}/examples/
 cp ${SYNTHESIZE_HOME}/templates/graphite/conf/* ${GRAPHITE_CONF}/
 cp ${SYNTHESIZE_HOME}/templates/collectd/collectd.conf /etc/collectd/
-cp ${SYNTHESIZE_HOME}/templates/apache/graphite.conf /etc/apache2/sites-available/
+cp ${SYNTHESIZE_HOME}/templates/apache/graphite.conf /etc/apache2/sites-available/${GRAPHITE_CONF_FILE}
 
 # Setup the correct Apache site and modules
 a2dissite 000-default
 a2ensite graphite
 a2enmod ssl
-a2enmod socache_shmcb
 
 # Install configuration files for Django
 cd ${GRAPHITE_HOME}/webapp/graphite

templates/apache/graphite.conf

@@ -11,12 +11,24 @@
   Alias /media/ "/usr/lib/pymodules/python2.6/django/contrib/admin/media/"
 
   <Directory /opt/graphite/conf>
-    Require all granted
+    <IfModule mod_authz_core.c>
+      Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+      Order allow,deny
+      Allow from all
+    </IfModule>
   </Directory>
 
   <Location /server-status>
     SetHandler server-status
-    Require all granted
+    <IfModule mod_authz_core.c>
+      Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+      Order allow,deny
+      Allow from all
+    </IfModule>
   </Location>
 
   #<Location />