| Index: trunk/debs/wikimedia-task-appserver/debian/dirs |
| — | — | @@ -1,3 +1,4 @@ |
| 2 | 2 | etc |
| 3 | 3 | etc/apache2 |
| 4 | 4 | usr/local/apache |
| | 5 | +etc/php5/apache2/ |
| Index: trunk/debs/wikimedia-task-appserver/debian/postrm |
| — | — | @@ -33,6 +33,8 @@ |
| 34 | 34 | remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) |
| 35 | 35 | dpkg-divert --package wikimedia-task-appserver --remove --rename \ |
| 36 | 36 | --divert /etc/apache2/apache2.conf.default /etc/apache2/apache2.conf |
| | 37 | + dpkg-divert --package wikimedia-task-appserver --remove --rename \ |
| | 38 | + --divert /etc/php5/apache2/php.ini.default /etc/php5/apache2/php.ini |
| 37 | 39 | |
| 38 | 40 | removemount /mnt/upload3 |
| 39 | 41 | removemount /mnt/math |
| Index: trunk/debs/wikimedia-task-appserver/debian/preinst |
| — | — | @@ -19,6 +19,8 @@ |
| 20 | 20 | install|upgrade) |
| 21 | 21 | dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 22 | 22 | --divert /etc/apache2/apache2.conf.default /etc/apache2/apache2.conf |
| | 23 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 24 | + --divert /etc/php5/apache2/php.ini.default /etc/php5/apache2/php.ini |
| 23 | 25 | ;; |
| 24 | 26 | |
| 25 | 27 | abort-upgrade) |
| Index: trunk/debs/wikimedia-task-appserver/debian/changelog |
| — | — | @@ -1,3 +1,9 @@ |
| | 2 | +wikimedia-task-appserver (1.11) feisty; urgency=low |
| | 3 | + |
| | 4 | + * Add diversion of /etc/php5/apache2/php.ini |
| | 5 | + |
| | 6 | + -- Tim Starling <tstarling@wikimedia.org> Tue, 28 Aug 2007 16:56:26 +0000 |
| | 7 | + |
| 2 | 8 | wikimedia-task-appserver (1.10) feisty; urgency=low |
| 3 | 9 | |
| 4 | 10 | * Fix control file that was accidently overwritten |
| Index: trunk/debs/wikimedia-task-appserver/debian/conffiles |
| — | — | @@ -1 +1,2 @@ |
| 2 | 2 | /etc/apache2/apache2.conf |
| | 3 | +/etc/php5/apache2/php.ini |
| 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 php.ini $(DESTDIR)/etc/php5/apache2 |
| 53 | 54 | install -m 0644 sudoers $(DESTDIR)/etc/ |
| 54 | 55 | |
| 55 | 56 | # Build architecture-independent files here. |
| Index: trunk/debs/wikimedia-task-appserver/php.ini |
| — | — | @@ -0,0 +1,27 @@ |
| | 2 | +; Wikimedia PHP configuration for PHP 5 Apache module in Ubuntu or FC
|
| | 3 | +
|
| | 4 | +default_socket_timeout = 1
|
| | 5 | +max_execution_time = 180
|
| | 6 | +memory_limit = 100M
|
| | 7 | +display_errors = Off
|
| | 8 | +error_log = syslog
|
| | 9 | +
|
| | 10 | +; Maximum file size (also in squid)
|
| | 11 | +post_max_size = 20M
|
| | 12 | +upload_max_filesize = 20M
|
| | 13 | +
|
| | 14 | +; Magic quotes are a tool of the devil! You know, a torture tool. That the
|
| | 15 | +; devil uses to torture programmers. Like me. I don't like that.
|
| | 16 | +magic_quotes_gpc = Off
|
| | 17 | +
|
| | 18 | +; Including both FC and Ubuntu paths here
|
| | 19 | +include_path = ".:/usr/local/lib/php:/usr/share/php:/usr/local/apache/common/php"
|
| | 20 | +
|
| | 21 | +; temporarily on while working on lucene config --brion 2005-04-16
|
| | 22 | +allow_url_fopen = On
|
| | 23 | +
|
| | 24 | +; Don't care about MySQL down too much
|
| | 25 | +mysql.connect_timeout = 1
|
| | 26 | +
|
| | 27 | +session.save_path = /tmp
|
| | 28 | +
|