| Index: branches/hardy/debs/wikimedia-task-appserver/debian/control |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | |
| 9 | 9 | Package: wikimedia-task-appserver |
| 10 | 10 | Architecture: all |
| 11 | | -Depends: apache2-mpm-prefork, librsvg2-bin, dvipng, gsfonts, ocaml, ploticus, php5-mysql, php5-curl, php5-xmlrpc, php5-cli, php-apc, php-wikidiff2, php5-fss, php5-geoip, libapache2-mod-php5, file, djvulibre-bin, tidy (>= 20070821), libtidy-0.99-0 (>= 20070821), php-pear, rsync, make, xpdf-utils, libtiff-tools, texlive, texlive-bibtex-extra, texlive-font-utils, texlive-fonts-extra, texlive-lang-croatian, texlive-lang-cyrillic, texlive-lang-czechslovak, texlive-lang-danish, texlive-lang-dutch, texlive-lang-finnish, texlive-lang-french, texlive-lang-german, texlive-lang-greek, texlive-lang-hungarian, texlive-lang-italian, texlive-lang-latin, texlive-lang-mongolian, texlive-lang-norwegian, texlive-lang-other, texlive-lang-polish, texlive-lang-portuguese, texlive-lang-spanish, texlive-lang-swedish, texlive-lang-vietnamese, texlive-latex-extra, texlive-math-extra, texlive-pictures, texlive-pstricks, texlive-publishers |
| | 11 | +Depends: apache2-mpm-prefork, librsvg2-bin, dvipng, tetex-bin, tetex-extra, gsfonts, ocaml, ploticus, php5-mysql, php5-curl, php5-xmlrpc, php5-cli, php5-apc, php5-wikidiff2, php5-fss, php5-geoip, libapache2-mod-php5, file, djvulibre-bin, tidy (>= 20070821), libtidy-0.99-0 (>= 20070821), php-pear, rsync, make, xpdf-utils, libtiff-tools |
| 12 | 12 | Description: Wikimedia application server |
| 13 | 13 | This package depends on all packages needed to setup a standard |
| 14 | 14 | application server, and contains the necessary deployment scripts. |
| Index: branches/hardy/debs/wikimedia-task-appserver/debian/postinst |
| — | — | @@ -55,6 +55,8 @@ |
| 56 | 56 | |
| 57 | 57 | create_apache_user |
| 58 | 58 | |
| | 59 | + chown -R pybal-check:pybal-check /var/lib/pybal-check/.ssh |
| | 60 | + |
| 59 | 61 | ;; |
| 60 | 62 | |
| 61 | 63 | abort-upgrade|abort-remove|abort-deconfigure) |
| Index: branches/hardy/debs/wikimedia-task-appserver/debian/postrm |
| — | — | @@ -23,6 +23,9 @@ |
| 24 | 24 | deluser apache || true |
| 25 | 25 | delgroup apache || true |
| 26 | 26 | |
| | 27 | + # Remove PyBal check user account |
| | 28 | + deluser pybal-check |
| | 29 | + rm -rf /var/lib/pybal-check |
| 27 | 30 | ;; |
| 28 | 31 | remove) |
| 29 | 32 | ;; |
| Index: branches/hardy/debs/wikimedia-task-appserver/debian/preinst |
| — | — | @@ -0,0 +1,44 @@ |
| | 2 | +#! /bin/sh |
| | 3 | +# preinst script for wikimedia-base |
| | 4 | +# |
| | 5 | +# see: dh_installdeb(1) |
| | 6 | + |
| | 7 | +set -e |
| | 8 | + |
| | 9 | +# summary of how this script can be called: |
| | 10 | +# * <new-preinst> `install' |
| | 11 | +# * <new-preinst> `install' <old-version> |
| | 12 | +# * <new-preinst> `upgrade' <old-version> |
| | 13 | +# * <old-preinst> `abort-upgrade' <new-version> |
| | 14 | +# |
| | 15 | +# for details, see http://www.debian.org/doc/debian-policy/ or |
| | 16 | +# the debian-policy package |
| | 17 | + |
| | 18 | +case "$1" in |
| | 19 | + install) |
| | 20 | + # Create user for the PyBal checks |
| | 21 | + adduser --system --home /var/lib/pybal-check --group --disabled-password --shell /bin/sh pybal-check |
| | 22 | + ;; |
| | 23 | + |
| | 24 | + upgrade) |
| | 25 | + # Create user for the PyBal checks |
| | 26 | + adduser --system --home /var/lib/pybal-check --group --disabled-password --shell /bin/sh pybal-check |
| | 27 | + ;; |
| | 28 | + |
| | 29 | + abort-upgrade) |
| | 30 | + ;; |
| | 31 | + |
| | 32 | + *) |
| | 33 | + echo "preinst called with unknown argument \`$1'" >&2 |
| | 34 | + exit 1 |
| | 35 | + ;; |
| | 36 | +esac |
| | 37 | + |
| | 38 | +# dh_installdeb will replace this with shell code automatically |
| | 39 | +# generated by other debhelper scripts. |
| | 40 | + |
| | 41 | +#DEBHELPER# |
| | 42 | + |
| | 43 | +exit 0 |
| | 44 | + |
| | 45 | + |
| Index: branches/hardy/debs/wikimedia-task-appserver/debian/changelog |
| — | — | @@ -1,36 +1,12 @@ |
| 2 | | -wikimedia-task-appserver (2.1-3) lucid-wikimedia; urgency=low |
| | 2 | +wikimedia-task-appserver (1.48) hardy-wikimedia; urgency=low |
| 3 | 3 | |
| 4 | | - * Removing pybal user install and remove from preinst and prerm |
| | 4 | + * Backported changes from the 2.x branch: |
| 5 | 5 | |
| 6 | | - -- Ryan Lane <rlane@wikimedia.org> Mon, 4 Feb 2011 22:29:00 +0000 |
| 7 | | - |
| 8 | | -wikimedia-task-appserver (2.1-2) lucid-wikimedia; urgency=low |
| 9 | | - |
| 10 | | - * Merging back in missing changes that Tim made in 1.47 |
| 11 | | - |
| 12 | | - -- Ryan Lane <rlane@wikimedia.org> Mon, 4 Feb 2011 22:15:00 +0000 |
| 13 | | - |
| 14 | | -wikimedia-task-appserver (2.1-1) lucid-wikimedia; urgency=low |
| 15 | | - |
| 16 | 6 | * Fix sync-common; it previously deleted a directory it was still in, |
| 17 | 7 | causing the following rsync to die. |
| 18 | 8 | |
| 19 | | - -- Ryan Lane <rlane@wikimedia.org> Mon, 4 Feb 2011 19:34:00 +0000 |
| | 9 | + -- Tim Starling <tstarling@wikimedia.org> Thu, 07 Jul 2011 18:03:23 +1000 |
| 20 | 10 | |
| 21 | | -wikimedia-task-appserver (2.0-2) lucid-wikimedia; urgency=low |
| 22 | | - |
| 23 | | - * Change section to net |
| 24 | | - * Change tetex packages to texlive packages |
| 25 | | - |
| 26 | | - -- Ryan Lane <rlane@wikimedia.org> Mon, 4 Feb 2011 19:34:00 +0000 |
| 27 | | - |
| 28 | | -wikimedia-task-appserver (2.0-1) lucid-wikimedia; urgency=low |
| 29 | | - |
| 30 | | - * Adapt to lucid |
| 31 | | - * Move pybal-check stuff to Puppet |
| 32 | | - |
| 33 | | - -- Mark Bergsma <mark@wikimedia.org> Fri, 25 Feb 2011 17:14:13 +0000 |
| 34 | | - |
| 35 | 11 | wikimedia-task-appserver (1.47) hardy-wikimedia; urgency=low |
| 36 | 12 | |
| 37 | 13 | * Updated sync scripts for MW 11.17 |
| Index: branches/hardy/debs/wikimedia-task-appserver/debian/rules |
| — | — | @@ -54,6 +54,9 @@ |
| 55 | 55 | install -m 0750 sync-common apache-sanity-check apache-start check-time scap-1skins scap-1 $(DESTDIR)/usr/bin |
| 56 | 56 | install -m 0750 scap-2 set-group-write2 install-common $(DESTDIR)/usr/sbin |
| 57 | 57 | |
| | 58 | + install -d -m 0750 $(DESTDIR)/var/lib/pybal-check/.ssh |
| | 59 | + install -m 0640 authorized_keys $(DESTDIR)/var/lib/pybal-check/.ssh/authorized_keys |
| | 60 | + |
| 58 | 61 | # Build architecture-independent files here. |
| 59 | 62 | binary-indep: build install |
| 60 | 63 | # We have nothing to do by default. |