projects
/
matthijs
/
servers
/
drsnuggles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a8068be
)
system: Let update-php.ini also include a php.ini.local
author
root
<root@template.drsnuggles.stderr.nl>
Fri, 7 Nov 2008 11:41:14 +0000
(12:41 +0100)
committer
root
<root@template.drsnuggles.stderr.nl>
Fri, 7 Nov 2008 11:41:14 +0000
(12:41 +0100)
usr/local/bin/update-php.ini
patch
|
blob
|
history
diff --git
a/usr/local/bin/update-php.ini
b/usr/local/bin/update-php.ini
index e801500e52b92f41e602db4ba26ad4536febc2b4..3147c93f5ef0c217615c6cc5bba7d8f96382b808 100755
(executable)
--- a/
usr/local/bin/update-php.ini
+++ b/
usr/local/bin/update-php.ini
@@
-1,8
+1,10
@@
#!/bin/sh
#!/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
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
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.
;
;
; 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
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
cat $IN >> $OUT
echo -e "\n;;; End included $IN ;;;\n" >> $OUT
done