main/redmine: clean up default config

- use sqlite as default db for config
- use the example configs from upstream
- give www-data group write permissions

1 files changed, 33 insertions, 41 deletions

diff --git a/main/redmine/APKBUILD b/main/redmine/APKBUILD
index b37fe7cfcf..4c99251f86 100644
--- a/main/redmine/APKBUILD
+++ b/main/redmine/APKBUILD
@@ -3,7 +3,7 @@
 _railsver=4.2
 pkgname=redmine
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Project management web application written in Ruby"
 url="http://redmine.org"
 arch="noarch"
@@ -37,12 +37,11 @@ makedepends="$depends_dev
 install="$pkgname.pre-install"
 subpackages=""
 pkgusers="$pkgname"
-pkggroups="$pkgname"
+pkggroups="$pkgname www-data"
 source="http://www.redmine.org/releases/redmine-$pkgver.tar.gz
 	gemfile.patch
-	additional_environment.rb
-	configuration.yml
-	database.yml"
+	database.yml.patch
+	"
 _webapps="usr/share/webapps"
 
 _builddir="$srcdir"/redmine-$pkgver
@@ -68,47 +67,40 @@ build() {
 
 package() {
 	cd "$_builddir"
-	# move app to webapps dir
-	mkdir -p "$pkgdir/$_webapps/$pkgname"
-	mv * "$pkgdir/$_webapps/$pkgname"
-	# install default config to /etc/redmine
-	install -g $pkggroups -m640 -D "$srcdir"/database.yml \
-		"$pkgdir"/etc/redmine/database.yml
-	install -g $pkggroups -m644 -D "$srcdir"/configuration.yml \
-		"$pkgdir"/etc/redmine/configuration.yml
-	install -g $pkggroups -m644 -D "$srcdir"/additional_environment.rb \
-		"$pkgdir"/etc/redmine/additional_environment.rb
-	cd "$pkgdir/$_webapps/$pkgname"/config
-	# link config to webapps dir
-	ln -s /etc/redmine/database.yml
-	ln -s /etc/redmine/configuration.yml
-	ln -s /etc/redmine/additional_environment.rb
-	cd "$pkgdir/$_webapps/$pkgname"
-	mkdir -p tmp tmp/pdf public/plugin_assets \
-		"$pkgdir"/var/log
-	chmod -R 755 files log tmp public/plugin_assets
-	# move redmine log to /var/log
-	mv log "$pkgdir"/var/log/$pkgname
-	# symlink logs to var log
-	ln -s /var/log/redmine log
-	# set correct permissions
-	chown -R $pkgusers:$pkggroups \
-		"$pkgdir/$_webapps/$pkgname" \
-		"$pkgdir"/var/log/"$pkgname"
+	# create dirs
+	mkdir -p "$pkgdir/$_webapps/$pkgname" "$pkgdir"/etc/redmine \
+		|| return 1
+	install -o redmine -g www-data -m775 -d \
+		"$pkgdir"/var/lib/redmine "$pkgdir"/var/log/redmine \
+		|| return 1
+
+	# move config files
+	for i in database.yml.example configuration.yml.example \
+			additional_environment.rb.example routes.rb; do
+		mv config/${i} "$pkgdir"/etc/redmine/${i%.example} || return 1
+		ln -s /etc/redmine/${i%.example} config/$i || return 1
+	done
+
+	# writeable data dirs
+	for i in files tmp public/plugin_assets; do
+		chown redmine:www-data $i || return 1
+		chmod 775 $i || return 1
+		mv $i "$pkgdir"/var/lib/redmine/ || return 1
+		ln -s /var/lib/redmine/${i#*/} $i || return 1
+	done
+
+	# log dir
+	rm -r log && ln -s /var/log/redmine log || return 1
+
+	mv * "$pkgdir/$_webapps/$pkgname" || return 1
 }
 
 md5sums="bf63ceef4fde0d38d17d94969478d422  redmine-3.0.1.tar.gz
 6115e9c82b7af28cb6849a1f8ad55c0d  gemfile.patch
-06fa866e699a6f867603f886be3a5eea  additional_environment.rb
-7347eb8fa89144c8a0ca292702203803  configuration.yml
-05e17d7ca4a268b7ab7d3b6a9f5f3fcb  database.yml"
+d834bef9b5f01484f1e0ee82676f4109  database.yml.patch"
 sha256sums="9b701ff471bf1d9c9fd671e6a3d3c426850df5411a73f891f49c2cd79d489d5a  redmine-3.0.1.tar.gz
 3dce0dccce0931e26d81546ba2c87b776da92a1e532e560f18b2355e378c92a0  gemfile.patch
-fc151100cad99bec40cd57eefcf05917b760cd1d189609b0da3c2454916363e0  additional_environment.rb
-5f17d5f2e37b4487c44154b2f212811d3a52fa1b7a0bcc9664e3caac80aa887c  configuration.yml
-243bf7ec026af6d158706f9275d40fd046a6038200664b9329fba25b4697816f  database.yml"
+28b1ec099ae87c43d00d7e997edabaece01d6fc2e67b46c50735e9a1bb72f130  database.yml.patch"
 sha512sums="689e8625197b4668bc06c68b0502a23e50675ad13d17a67a25cb51d68b1ac15ff4395783003ce696994bd15191139adde6bc21add0b81b4a40e9979e95753e18  redmine-3.0.1.tar.gz
 5cd897dd296c4f89500bb607f2e0898e0af8ec10292f23d16dbb9ea686d10a6bd2b1a9bfdec2aa722461a02ae73ba5160115e5d9ec78031387c7c337eba56ede  gemfile.patch
-0ac637c140ace5760067917db755a65add5362a8fbda87bdbe17c1f39c46861ecfbe096fe5d4e9ff2525d325ebd46ca995049f9cb326e376cc9074843bd0051a  additional_environment.rb
-a62ac016fc3e58db7db453bdb779cd0d542a610cf7d1be2fdb07d39a1531c558d81af3d91adafffee28311387b65079faf3ee3bc9c14dd12ceb5bac83254fdbd  configuration.yml
-a6a52d469ce390331124908bad650c190236b86439f7e38bfc2ff738c82182915ad4c35365533f6eed1216a47ef0f3fe7185e5a4107f6e7c8646222804743112  database.yml"
+1b5880979f050a71d726c844369cc5340a8d4aa0b59b2301e1d32dea28f70ca2a85e619c8b845c37de08772154eef13fa63716c1beaaa50d97b80fd65c297bf9  database.yml.patch"