From bddf3be000f10dded2305ae67c954e21f9afc6e7 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Mon, 20 Jun 2011 14:46:48 +0000
Subject: testing/redmine: some apkbuild fixes and cleanup

---
 testing/redmine/APKBUILD | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/testing/redmine/APKBUILD b/testing/redmine/APKBUILD
index 235e8c043..b3bd5a13f 100644
--- a/testing/redmine/APKBUILD
+++ b/testing/redmine/APKBUILD
@@ -39,45 +39,43 @@ build() {
 
 package() {
 	cd "$_builddir"
-        mkdir -p "$pkgdir/$_webapps/$pkgname" \
+	mkdir -p "$pkgdir/$_webapps/$pkgname" \
 		"$pkgdir"/var/log \
 		"$pkgdir"/etc/lighttpd \
 		"$pkgdir"/var/www/localhost/htdocs
 	# move app to webapps dir
 	mv * "$pkgdir/$_webapps/$pkgname"
-        # install default config to /etc/redmine
-        install -m644 -D "$srcdir"/database.yml \
+	# install default config to /etc/redmine
+	install -m644 -D "$srcdir"/database.yml \
 		"$pkgdir"/etc/redmine/database.yml
-        install -m644 -D "$srcdir"/configuration.yml \
+	install -m644 -D "$srcdir"/configuration.yml \
 		"$pkgdir"/etc/redmine/configuration.yml
-        install -m644 -D "$srcdir"/additional_environment.rb \
+	install -m644 -D "$srcdir"/additional_environment.rb \
 		"$pkgdir"/etc/redmine/additional_environment.rb
+	# we use fcgi by default
+	cd "$pkgdir/$_webapps/$pkgname"/public
+	ln -s dispatch.fcgi.example dispatch.fcgi
+	cd "$pkgdir/$_webapps/$pkgname"/config
 	# link config to webapps dir
-	ln -s /etc/redmine/database.yml \
-                "$pkgdir/$_webapps/$pkgname"/config/database.yml
-        ln -s /etc/redmine/configuration.yml \
-		"$pkgdir/$_webapps/$pkgname"/config/configuration.yml
-        ln -s /etc/redmine/additional_environment.rb \
-		"$pkgdir/$_webapps/$pkgname"/config/additional_environment.rb
+	ln -s /etc/redmine/database.yml
+	ln -s /etc/redmine/configuration.yml
+	ln -s /etc/redmine/additional_environment.rb
 	# move redmine log to /var/log
-	mv "$pkgdir/$_webapps/$pkgname"/log \
-		"$pkgdir"/var/log/$pkgname
-        # symlink logs to var log
-	ln -s /var/log/redmine \
-                "$pkgdir/$_webapps/$pkgname"/log
+	cd "$pkgdir/$_webapps/$pkgname"
+	mv log "$pkgdir"/var/log/$pkgname
+	# symlink logs to var log
+	ln -s /var/log/redmine log
 	# symlink redmine to htdocs dir
 	ln -s "/$_webapps/$pkgname" \
 		"$pkgdir"/var/www/localhost/htdocs/"$pkgname"
         # example lighttpd config for redmine virtual hosting
-        cp "$srcdir"/lighttpd-virtual.conf \
-                "$pkgdir"/etc/lighttpd/redmine-virtual.conf
+	cp "$srcdir"/lighttpd-virtual.conf \
+		"$pkgdir"/etc/lighttpd/redmine-virtual.conf
 	# set correct permissions 
 	chown -R lighttpd:lighttpd \
 		"$pkgdir/$_webapps/$pkgname" \
-                "$pkgdir"/var/log/"$pkgname" \
-                "$pkgdir"/etc/"$pkgname"
-	ln -s "$pkgdir/$_webapps/$pkgname"/public/dispatch.fcgi.example \
-		"$pkgdir/$_webapps/$pkgname"/public/dispatch.fcgi
+		"$pkgdir"/var/log/"$pkgname" \
+		"$pkgdir"/etc/"$pkgname"
 }
 
 md5sums="9d9809a6137c75f754a7fb6c0acc1d6c  redmine-1.2.0.tar.gz
-- 
cgit v1.2.3