main/redmine: misc fixes

- use local sendmail as default mailer
- fix log config
- fix some deps
- fix some permissions
- add example for sqlite

4 files changed, 21 insertions, 18 deletions

diff --git a/main/redmine/APKBUILD b/main/redmine/APKBUILD
index d55ab74c87..9018cb8016 100644
--- a/main/redmine/APKBUILD
+++ b/main/redmine/APKBUILD
@@ -2,12 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=redmine
 pkgver=2.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Project management web application written in Ruby"
 url="http://redmine.org"
 arch="noarch"
 license="GPL2"
 depends="ruby-rails ruby-fcgi ruby-rmagick ruby-i18n ruby-openid
+	ruby-mocha ruby-jquery-rails
 	lighttpd"
 depends_dev=
 makedepends="$depends_dev ruby-gems"
@@ -48,11 +49,11 @@ package() {
 	# move app to webapps dir
 	mv * "$pkgdir/$_webapps/$pkgname"
 	# install default config to /etc/redmine
-	install -m644 -D "$srcdir"/database.yml \
+	install -g lighttpd -m640 -D "$srcdir"/database.yml \
 		"$pkgdir"/etc/redmine/database.yml
-	install -m644 -D "$srcdir"/configuration.yml \
+	install -g lighttpd -m644 -D "$srcdir"/configuration.yml \
 		"$pkgdir"/etc/redmine/configuration.yml
-	install -m644 -D "$srcdir"/additional_environment.rb \
+	install -g lighttpd -m644 -D "$srcdir"/additional_environment.rb \
 		"$pkgdir"/etc/redmine/additional_environment.rb
 	# we use fcgi by default
 	cd "$pkgdir/$_webapps/$pkgname"/public
@@ -62,8 +63,12 @@ package() {
 	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
 	cd "$pkgdir/$_webapps/$pkgname"
+	# permissions
+	mkdir -p tmp tmp/pdf public/plugin_assets
+	chown -R lighttpd:lighttpd files log tmp public/plugin_assets
+	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
@@ -76,12 +81,11 @@ package() {
 	# set correct permissions 
 	chown -R lighttpd:lighttpd \
 		"$pkgdir/$_webapps/$pkgname" \
-		"$pkgdir"/var/log/"$pkgname" \
-		"$pkgdir"/etc/"$pkgname"
+		"$pkgdir"/var/log/"$pkgname"
 }
 
 md5sums="42feb03a4447bb6551eba34721ec235b  redmine-2.1.2.tar.gz
-b9ca61be7418969188c74c110e3fe3a5  additional_environment.rb
-69243d1b5b9b111da631c7034d51ba71  configuration.yml
-4c4b10aadbc229ea75f309ff1fafcd7a  database.yml
+06fa866e699a6f867603f886be3a5eea  additional_environment.rb
+7347eb8fa89144c8a0ca292702203803  configuration.yml
+2b97d378d27a10a7b5ff2161aefbbb1a  database.yml
 f43ad7e5875b46b723c69b3a9b5e52f2  lighttpd-virtual.conf"
diff --git a/main/redmine/additional_environment.rb b/main/redmine/additional_environment.rb
index 0d37f579d6..e64b2f8e12 100644
--- a/main/redmine/additional_environment.rb
+++ b/main/redmine/additional_environment.rb
@@ -11,6 +11,7 @@
 #   ...
 #
 
+config.log_path = "/var/log/redmine/redmine.log"
 config.logger = Logger.new(config.log_path, 2, 1000000)
 config.logger.level = Logger::WARN
 
diff --git a/main/redmine/configuration.yml b/main/redmine/configuration.yml
index a729c60c7d..d5dfabb9a6 100644
--- a/main/redmine/configuration.yml
+++ b/main/redmine/configuration.yml
@@ -81,14 +81,7 @@
 default:
   # Outgoing emails configuration (see examples above)
   email_delivery:
-    delivery_method: :smtp
-    smtp_settings:
-      address: smtp.example.net
-      port: 25
-      domain: example.net
-      authentication: :login
-      user_name: "redmine@example.net"
-      password: "redmine"
+    delivery_method: :sendmail
   
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.
diff --git a/main/redmine/database.yml b/main/redmine/database.yml
index eb934bf765..fb20946b13 100644
--- a/main/redmine/database.yml
+++ b/main/redmine/database.yml
@@ -8,3 +8,8 @@ production:
   password:
   encoding: utf8
  
+#production:
+#  adapter: sqlite3
+#  database: redmine
+#  dbfile: /var/lib/redmine/redmine.db
+