| Index: trunk/debs/wikimedia-task-appserver/debian/postrm |
| — | — | @@ -32,6 +32,7 @@ |
| 33 | 33 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/apache2.conf |
| 34 | 34 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/php5/apache2/php.ini |
| 35 | 35 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/sudoers |
| | 36 | + dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/envvars |
| 36 | 37 | ;; |
| 37 | 38 | remove) |
| 38 | 39 | removemount /mnt/upload3 |
| Index: trunk/debs/wikimedia-task-appserver/debian/preinst |
| — | — | @@ -23,6 +23,8 @@ |
| 24 | 24 | --divert /etc/php5/apache2/php.ini.default /etc/php5/apache2/php.ini |
| 25 | 25 | dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 26 | 26 | --divert /etc/sudoers.default /etc/sudoers |
| | 27 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 28 | + --divert /etc/apache2/envvars.default /etc/apache2/envvars |
| 27 | 29 | ;; |
| 28 | 30 | |
| 29 | 31 | upgrade|abort-upgrade) |
| Index: trunk/debs/wikimedia-task-appserver/debian/changelog |
| — | — | @@ -1,3 +1,9 @@ |
| | 2 | +wikimedia-task-appserver (1.16) feisty; urgency=low |
| | 3 | + |
| | 4 | + * Added /etc/apache2/envvars |
| | 5 | + |
| | 6 | + -- Tim Starling <tstarling@wikimedia.org> Wed, 29 Aug 2007 00:46:34 +0000 |
| | 7 | + |
| 2 | 8 | wikimedia-task-appserver (1.15) feisty; urgency=low |
| 3 | 9 | |
| 4 | 10 | * No, really, mode 400 for sudoers. |
| Index: trunk/debs/wikimedia-task-appserver/debian/conffiles |
| — | — | @@ -1,3 +1,4 @@ |
| 2 | 2 | /etc/apache2/apache2.conf |
| 3 | 3 | /etc/php5/apache2/php.ini |
| 4 | 4 | /etc/sudoers |
| | 5 | +/etc/apache2/envvars |
| Index: trunk/debs/wikimedia-task-appserver/debian/rules |
| — | — | @@ -49,6 +49,7 @@ |
| 50 | 50 | dh_link |
| 51 | 51 | |
| 52 | 52 | install -m 0644 apache2.conf $(DESTDIR)/etc/apache2 |
| | 53 | + install -m 0644 envvars $(DESTDIR)/etc/apache2 |
| 53 | 54 | install -m 0644 php.ini $(DESTDIR)/etc/php5/apache2 |
| 54 | 55 | install -m 0400 sudoers $(DESTDIR)/etc/ |
| 55 | 56 | |
| Index: trunk/debs/wikimedia-task-appserver/envvars |
| — | — | @@ -0,0 +1,11 @@ |
| | 2 | +# Wikimedia configuration file, a hook into apache2ctl |
| | 3 | +# vim: ft=sh : |
| | 4 | + |
| | 5 | +# Set nice level |
| | 6 | +HTTPD="nice -n10 /usr/sbin/apache2 -DPHP5" |
| | 7 | + |
| | 8 | +# Image scaler detection |
| | 9 | +if [ -e /etc/wikimedia-image-scaler ]; then |
| | 10 | + HTTPD="$HTTPD -DSCALER" |
| | 11 | +fi |
| | 12 | + |