X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=usr%2Flocal%2Fbin%2Fupdate-php.ini;fp=usr%2Flocal%2Fbin%2Fupdate-php.ini;h=3147c93f5ef0c217615c6cc5bba7d8f96382b808;hb=7cff1da7d1aa69b2267315410b5d601f44742b80;hp=e801500e52b92f41e602db4ba26ad4536febc2b4;hpb=a8068be88699ef7b807284319f4a65d01b58ca5f;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/usr/local/bin/update-php.ini b/usr/local/bin/update-php.ini
index e801500..3147c93 100755
--- a/usr/local/bin/update-php.ini
+++ b/usr/local/bin/update-php.ini
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-# This script will merge the main php.ini with site specific additions into a site specific php.ini.
+# This script will merge the main php.ini with local and site specific
+# additions into a site specific php.ini.
 
 BASE=/etc/php5/cgi/php.ini
+LOCAL=/etc/php5/cgi/php.ini.local
 SITES=/data/www/*
 CONFIN=conf/php.ini.override
 CONFOUT=conf/php.ini
@@ -22,18 +24,22 @@ for SITE in $SITES; do
 ; 
 ; Do NOT edit this file directly.
 ;
-; You should instead edit $IN and run $0 afterwards.
+; You should instead edit $IN (for site-specific config) or $LOCAL (for global
+; config) and run $0 afterwards.
 ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-;;; Begin included $BASE ;;;
+;;; Begin included $BASE (this is the default config from php) ;;;
 
 EOF
 	
 	cat $BASE >> $OUT
 	echo -e "\n;;; End included $BASE ;;;\n" >> $OUT
-	echo -e "\n;;; Begin included $IN ;;;\n" >> $OUT
+	echo -e "\n;;; Begin included $LOCAL (these are global config changes) ;;;\n" >> $OUT
+	cat $LOCAL >> $OUT
+	echo -e "\n;;; End included $LOCAL ;;;\n" >> $OUT
+	echo -e "\n;;; Begin included $IN (these are config changes specific to this site) ;;;\n" >> $OUT
 	cat $IN >> $OUT
 	echo -e "\n;;; End included $IN ;;;\n" >> $OUT
 done