From 23b5ad407afa6d032ab56495128f6a250f1b358d Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Tue, 31 Jan 2012 18:06:56 +0000 Subject: [PATCH] Update drupal appliance --- drupal/Makefile | 5 +++-- drupal/firstboot.start | 2 +- drupal/motd.sh | 2 +- drupal/package.keywords | 2 +- drupal/package.use | 2 +- drupal/world | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drupal/Makefile b/drupal/Makefile index c2a265c..83f96ae 100644 --- a/drupal/Makefile +++ b/drupal/Makefile @@ -1,5 +1,5 @@ -PGVER = 9.0 -DPVER = 7.4 +PGVER = 9.1 +DPVER = 7.10 inroot := chroot $(CHROOT) rcdefault := /etc/runlevels/default @@ -11,6 +11,7 @@ postinstall: firstboot.start $(inroot) passwd -d postgres echo 'PG_INITDB_OPTS="--locale=en_US.UTF-8"' >> $(CHROOT)/etc/conf.d/postgresql-$(PGVER) $(inroot) eselect postgresql set $(PGVER) + rm -rf $(CHROOT)/var/lib/postgresql/$(PGVER) yes | $(inroot) $(EMERGE) --config =postgresql-server-$(PGVER)* $(inroot) ln -sf /etc/init.d/postgresql-$(PGVER) $(rcdefault)/postgresql-$(PGVER) $(inroot) ln -sf /etc/init.d/apache2 $(rcdefault)/apache2 diff --git a/drupal/firstboot.start b/drupal/firstboot.start index 579a787..fed0b27 100755 --- a/drupal/firstboot.start +++ b/drupal/firstboot.start @@ -1,6 +1,6 @@ #!/bin/sh -DPVER=7.4 +DPVER=7.10 echo Configuring Postgres for Drupal createuser --no-adduser --no-createdb --no-createrole -U postgres drupal diff --git a/drupal/motd.sh b/drupal/motd.sh index 89ee928..1ea41fb 100755 --- a/drupal/motd.sh +++ b/drupal/motd.sh @@ -8,7 +8,7 @@ UDEV=$5 DASH=$6 ARCH=$7 -DPVER=7.4 +DPVER=7.10 TZ=$TIMEZONE ; export TZ diff --git a/drupal/package.keywords b/drupal/package.keywords index 34d9982..231c862 100644 --- a/drupal/package.keywords +++ b/drupal/package.keywords @@ -1,2 +1,2 @@ www-apps/drupal ~amd64 ~x86 -dev-php5/pecl-uploadprogress ~amd64 ~x86 +dev-php/pecl-uploadprogress ~amd64 ~x86 diff --git a/drupal/package.use b/drupal/package.use index 5315c14..539cfb9 100644 --- a/drupal/package.use +++ b/drupal/package.use @@ -1,7 +1,7 @@ app-editors/nano ncurses dev-lang/php ctype fileinfo filter iconv phar posix simplexml tokenizer apache2 xml pdo gd postgres apache2 zlib cli session hash json dev-lang/python ssl threads xml -dev-php5/pecl-uploadprogress php_targets_php5-3 +dev-php/pecl-uploadprogress php_targets_php5-3 mail-mta/ssmtp mta ssl net-misc/dhcp client sys-devel/gcc cxx diff --git a/drupal/world b/drupal/world index e36b9f6..3e4ec37 100644 --- a/drupal/world +++ b/drupal/world @@ -1,5 +1,5 @@ -=dev-db/postgresql-server-9.0* -dev-php5/pecl-uploadprogress +dev-db/postgresql-server:9.1 +dev-php/pecl-uploadprogress mail-mta/ssmtp net-misc/dhcp www-apps/drupal