diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 1 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server-preserve-db.sh | 28 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 25 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/changelog | 6 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/config | 25 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/control | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/po/POTFILES.in | 1 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/postinst | 3 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/templates | 20 |
10 files changed, 21 insertions, 92 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 5610de515b..c05f14a7cb 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -17,7 +17,6 @@ prepare: cp init.d SOURCES/rabbitmq-server.init cp rabbitmqctl_wrapper SOURCES/rabbitmq-server.wrapper cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate - cp rabbitmq-server-preserve-db.sh SOURCES server: prepare rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target i386 diff --git a/packaging/RPMS/Fedora/rabbitmq-server-preserve-db.sh b/packaging/RPMS/Fedora/rabbitmq-server-preserve-db.sh deleted file mode 100644 index e885b6b80f..0000000000 --- a/packaging/RPMS/Fedora/rabbitmq-server-preserve-db.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -if [ "$1x" = "x" ]; then - echo "You haven't specified the initial location of the RabbitMQ database" - exit 1 -fi - -if [ ! -d "$1" ]; then - echo "The directory containing the RabbitMQ database doesn't exist" - exit 1 -fi - -echo -echo "The RabbitMQ database schema has changed." -echo "If your RabbitMQ database contains important data," -echo "such as user accounts, durable exchanges and queues," -echo "or persistent messages, then we recommend you contact" -echo "support@rabbitmq.com for assistance with the upgrade." -echo "The current RabbitMQ database will be moved to the" -echo "directory: " - -CURRENT_MNESIA_DIR=$1 -DATE=`date +'%d_%m_%Y'` -TMP_OLD_MNESIA_DIR=$CURRENT_MNESIA_DIR.$$.${DATE} -mv "$CURRENT_MNESIA_DIR" "$TMP_OLD_MNESIA_DIR" - -echo "$TMP_OLD_MNESIA_DIR" -echo
\ No newline at end of file diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 3cde1dc923..13cfb0372e 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -7,7 +7,6 @@ Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{v Source1: rabbitmq-server.init Source2: rabbitmq-server.wrapper Source3: rabbitmq-server.logrotate -Source4: rabbitmq-server-preserve-db.sh URL: http://www.rabbitmq.com/ Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. %if 0%{?debian} @@ -75,10 +74,16 @@ install -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmqctl %endif mkdir -p %{buildroot}/etc/logrotate.d -install %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server +install -m 0644 %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL +#Build the list of files +rm -f %{_builddir}/filelist.%{name}.rpm +echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm +(cd %{buildroot}; find . ! -regex '\./etc.*' \ + -type f | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm) + %post # create rabbitmq group if ! getent group rabbitmq >/dev/null; then @@ -88,17 +93,12 @@ fi # create rabbitmq user if ! getent passwd rabbitmq >/dev/null; then useradd -r -g rabbitmq --home /var/lib/rabbitmq rabbitmq - usermod -c "Rabbit AMQP Messaging Server" rabbitmq + usermod -c "RabbitMQ messaging server" rabbitmq fi chown -R rabbitmq:rabbitmq /var/lib/rabbitmq chown -R rabbitmq:rabbitmq /var/log/rabbitmq -su rabbitmq -s /bin/sh -c %{_rabbitbindir}/rabbitmq-mnesia-current -if [ $? = 1 ]; then - /bin/sh %SOURCE4 /var/lib/rabbitmq/mnesia -fi - /sbin/chkconfig --add %{name} /sbin/service rabbitmq-server start @@ -112,12 +112,8 @@ if [ $1 = 0 ]; then # Leave rabbitmq user and group fi -%files +%files -f ../filelist.%{name}.rpm %defattr(-,root,root,-) -%{_erllibdir}/rabbitmq_server-%{version}/ -%{_rabbitbindir}/ -%{_mandir}/ -%{_sbindir}/rabbitmqctl %dir /var/lib/rabbitmq %dir /var/log/rabbitmq /etc/rc.d/init.d/rabbitmq-server @@ -128,6 +124,9 @@ fi rm -rf %{buildroot} %changelog +* Wed Dec 17 2008 Matthias Radestock <matthias@lshift.net> 1.5.0-1 +- New upstream release + * Thu Jul 24 2008 Tony Garnock-Jones <tonyg@lshift.net> 1.4.0-1 - New upstream release diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 0bf3a2d8c6..9479feb001 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -21,7 +21,7 @@ package: clean cp -r debian $(UNPACKED_DIR) chmod a+x $(UNPACKED_DIR)/debian/rules UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) - cd $(UNPACKED_DIR); debconf-updatepo; GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) + cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) rm -rf $(UNPACKED_DIR) clean: diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog index 07f5a8dd41..e8be8d8d8c 100644 --- a/packaging/debs/Debian/debian/changelog +++ b/packaging/debs/Debian/debian/changelog @@ -1,3 +1,9 @@ +rabbitmq-server (1.5.0-1) testing; urgency=low + + * New Upstream Release + + -- Matthias Radestock <matthias@lshift.net> Wed, 17 Dec 2008 18:23:47 +0000 + rabbitmq-server (1.4.0-1) testing; urgency=low * New Upstream Release diff --git a/packaging/debs/Debian/debian/config b/packaging/debs/Debian/debian/config deleted file mode 100644 index 9020888aad..0000000000 --- a/packaging/debs/Debian/debian/config +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -e - -# Source debconf library. -. /usr/share/debconf/confmodule - -if ! su rabbitmq -s /bin/sh -c /usr/lib/rabbitmq/bin/rabbitmq-mnesia-current ; then - db_beginblock - db_input high rabbitmq-server/mnesia-dir-note || true - db_input high rabbitmq-server/do-what-with-mnesia-dir || true - db_endblock - db_go - - db_get rabbitmq-server/do-what-with-mnesia-dir - if [ "$RET" = "Deleted" ]; then - rm -r /var/lib/rabbitmq/mnesia/ - elif [ "$RET" = "Moved" ]; then - db_input high rabbitmq-server/move-mnesia-dir-where || true - db_go - - db_get rabbitmq-server/move-mnesia-dir-where - - mkdir -p "`dirname $RET`" - mv /var/lib/rabbitmq/mnesia "$RET" - fi -fi diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control index d5d49f3fe9..b2b3ab0236 100644 --- a/packaging/debs/Debian/debian/control +++ b/packaging/debs/Debian/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.0 Package: rabbitmq-server Architecture: all -Depends: erlang-nox, adduser, ${misc:Depends} +Depends: erlang-nox, adduser, logrotate, ${misc:Depends} Description: An AMQP server written in Erlang RabbitMQ is an implementation of AMQP, the emerging standard for high performance enterprise messaging. The RabbitMQ server is a robust and diff --git a/packaging/debs/Debian/debian/po/POTFILES.in b/packaging/debs/Debian/debian/po/POTFILES.in deleted file mode 100644 index cef83a3407..0000000000 --- a/packaging/debs/Debian/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates diff --git a/packaging/debs/Debian/debian/postinst b/packaging/debs/Debian/debian/postinst index d0575628fe..495b8331f0 100644 --- a/packaging/debs/Debian/debian/postinst +++ b/packaging/debs/Debian/debian/postinst @@ -26,7 +26,7 @@ fi # create rabbitmq user if ! getent passwd rabbitmq >/dev/null; then adduser --system --ingroup rabbitmq --home /var/lib/rabbitmq --no-create-home rabbitmq - usermod -c "Rabbit AMQP Messaging Server" rabbitmq + usermod -c "RabbitMQ messaging server" rabbitmq fi chown -R rabbitmq:rabbitmq /var/lib/rabbitmq @@ -34,7 +34,6 @@ chown -R rabbitmq:rabbitmq /var/log/rabbitmq case "$1" in configure) - . /usr/share/debconf/confmodule ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/packaging/debs/Debian/debian/templates b/packaging/debs/Debian/debian/templates deleted file mode 100644 index 2d5acc155e..0000000000 --- a/packaging/debs/Debian/debian/templates +++ /dev/null @@ -1,20 +0,0 @@ -Template: rabbitmq-server/mnesia-dir-note -Type: note -_Description: Schema changed - The RabbitMQ database schema has changed. If your RabbitMQ database - contains important data, such as user accounts, durable exchanges and - queues, or persistent messages, then it is recommended to contact - support@rabbitmq.com for assistance with the upgrade. If you want to - experiment with the new version in the meantime, simply move the database - directory to a safe place. In all other cases just remove the directory. - -Template: rabbitmq-server/do-what-with-mnesia-dir -Type: select -_Choices: Moved, Deleted, Kept (WILL BREAK) -Default: Moved -_Description: The old RabbitMQ database directory should be: - -Template: rabbitmq-server/move-mnesia-dir-where -Type: string -Default: /var/lib/rabbitmq/mnesia-old/ -_Description: Directory where the old RabbitMQ database should be moved: |