Merge branch 'issue66' into up-dev

packaging/Makefile

@@ -18,6 +18,7 @@ rpm:
 	@cp -R ../core/target/tools/lib/*.jar target/var/lib/rundeck/cli
 	@find ../core/target/bin ! -regex ".*.bat$$" -and -type f | sed -e /rd-check/d -e /rd-setup/d | xargs -I Z cp Z target/usr/bin
 	@unzip -oq ../rundeckapp/target/rundeck-1.0.0.war -d target/var/lib/rundeck/exp/webapp/
+	ln -s /var/lib/rundeck/exp/webapp/WEB-INF/classes/log4j.properties; mv log4j.properties target/var/lib/rundeck/exp/webapp/WEB-INF/classes
 	rpmbuild -bb --target=noarch-linux $(RPMBUILD_DEFINES) --buildroot="${PWD}/target" rundeck.spec 
 
 clean:

packaging/root/etc/rundeck/server/log4j.properties

@@ -1,10 +1,11 @@
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 # Enable logging for everything. Rarely useful
-log4j.rootLogger=INFO, stdout, file
+log4j.rootLogger=warn, stdout, file
 
 # Enable audit logging
-log4j.logger.com.dtolabs.rundeck.core.authorization=INFO, audit
+log4j.logger.com.dtolabs.rundeck.core.authorization=info, audit
+log4j.additivity.com.dtolabs.rundeck.core.authorization=false
 
 # Enable this logger to log Hibernate output
 # handy to see its database interaction activity
@@ -17,21 +18,21 @@ log4j.logger.com.dtolabs.rundeck.core.authorization=INFO, audit
 
 # This logger covers all of Grails' internals
 # Enable to see whats going on underneath. 
-log4j.logger.org.codehaus.groovy.grails=info,stdout 
+log4j.logger.org.codehaus.groovy.grails=warn,stdout
 log4j.additivity.org.codehaus.groovy.grails=false
 
 # This logger is useful if you just want to see what Grails
 # configures with Spring at runtime. Setting to debug will show
 # each bean that is configured
-log4j.logger.org.codehaus.groovy.grails.commons.spring=info,stdout
+log4j.logger.org.codehaus.groovy.grails.commons.spring=warn,stdout
 log4j.additivity.org.codehaus.groovy.grails.commons.spring=false  
 
 # Interesting Logger to see what some of the Grails factory beans are doing
-log4j.logger.org.codehaus.groovy.grails.beans.factory=info,stdout
+log4j.logger.org.codehaus.groovy.grails.beans.factory=warn,stdout
 log4j.additivity.org.codehaus.groovy.grails.beans.factory=false
 
 # This logger is for Grails' public APIs within the grails. package
-log4j.logger.grails=info,stdout
+log4j.logger.grails=warn,stdout
 log4j.additivity.grails=false        
 
 #
@@ -52,7 +53,7 @@ log4j.appender.file.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
 # audit 
 #
 log4j.appender.audit=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.audit.file=/var/log/rundeck/authorization.audit.log
+log4j.appender.audit.file=/var/log/rundeck/rundeck.audit.log
 log4j.appender.audit.append=true
 log4j.appender.audit.layout=org.apache.log4j.PatternLayout
 log4j.appender.audit.layout.ConversionPattern=%d{ISO8601} - %m%n