| Index: trunk/debs/testswarm/debian/changelog |
| — | — | @@ -1,3 +1,11 @@ |
| | 2 | +testswarm (0.1.0-3) unstable; urgency=low |
| | 3 | + * symlink testswarm apache conf in /etc/apache2/conf.d just like other |
| | 4 | + Debian packages. Administration using virtual hosts will have to set |
| | 5 | + up their own configuration in /etc/apache2/sites-available then symlink |
| | 6 | + in /etc/apache2/sites-enabled. |
| | 7 | + |
| | 8 | + -- Antoine Musso <amusso@wikimedia.org> Tue, 13 Dec 2011 15:12:14 +0000 |
| | 9 | + |
| 2 | 10 | testswarm (0.1.0-2) unstable; urgency=low |
| 3 | 11 | * symlink testswarm apache conf in /etc/apache2/sites-enabled |
| 4 | 12 | |
| Index: trunk/debs/testswarm/debian/testswarm.postinst |
| — | — | @@ -29,8 +29,8 @@ |
| 30 | 30 | a2enmod rewrite |
| 31 | 31 | |
| 32 | 32 | # Symlink default conf if there is none |
| 33 | | -if [ ! -e "/etc/apache2/sites-enabled/testswarm.conf" ]; then |
| 34 | | - ln -s /etc/testswarm/apache.conf /etc/apache2/sites-enabled/testswarm.conf |
| | 33 | +if [ ! -e "/etc/apache2/conf.d/testswarm.conf" ]; then |
| | 34 | + ln -s /etc/testswarm/apache.conf /etc/apache2/conf.d/testswarm.conf |
| 35 | 35 | fi |
| 36 | 36 | invoke-rc.d apache2 reload || true |
| 37 | 37 | |
| Index: trunk/debs/testswarm/debian/testswarm.postrm |
| — | — | @@ -34,6 +34,8 @@ |
| 35 | 35 | |
| 36 | 36 | remove) |
| 37 | 37 | # unlink testswarm apache conf and restart apache |
| | 38 | + # /etc/testswarm/apache.conf is still there though so local modification |
| | 39 | + # are kept :) |
| 38 | 40 | if [ -L "/etc/apache2/conf.d/testswarm.conf" ]; then |
| 39 | 41 | rm /etc/apache2/conf.d/testswarm.conf |
| 40 | 42 | fi |