Skip to content

Commit 718934b

Browse files
committedApr 22, 2016
removes environment-specific properties from config.groovy - should be in external config file and managed via ansible inventories
1 parent fb8062e commit 718934b

File tree

1 file changed

+44
-99
lines changed

1 file changed

+44
-99
lines changed
 

‎grails-app/conf/Config.groovy

+44-99
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ grails.project.groupId = au.org.ala.postie // change this to alter the default p
3333
grails.mime.file.extensions = true // enables the parsing of file extensions from URLs into the request format
3434
grails.mime.use.accept.header = false
3535
grails.mime.types = [
36-
all: '*/*',
37-
atom: 'application/atom+xml',
38-
css: 'text/css',
39-
csv: 'text/csv',
40-
form: 'application/x-www-form-urlencoded',
41-
html: ['text/html','application/xhtml+xml'],
42-
js: 'text/javascript',
43-
json: ['application/json', 'text/json'],
44-
multipartForm: 'multipart/form-data',
45-
rss: 'application/rss+xml',
46-
text: 'text/plain',
47-
xml: ['text/xml', 'application/xml']
36+
all: '*/*',
37+
atom: 'application/atom+xml',
38+
css: 'text/css',
39+
csv: 'text/csv',
40+
form: 'application/x-www-form-urlencoded',
41+
html: ['text/html','application/xhtml+xml'],
42+
js: 'text/javascript',
43+
json: ['application/json', 'text/json'],
44+
multipartForm: 'multipart/form-data',
45+
rss: 'application/rss+xml',
46+
text: 'text/plain',
47+
xml: ['text/xml', 'application/xml']
4848
]
4949

5050
// URL Mapping Cache Max Size, defaults to 5000
@@ -98,10 +98,10 @@ log4j = {
9898
environments {
9999
production {
100100
rollingFile name: "postie-prod",
101-
maxFileSize: 104857600,
102-
file: logging_dir + "/alerts.log",
103-
threshold: org.apache.log4j.Level.ERROR,
104-
layout: pattern(conversionPattern: "%d [%c{1}] %m%n")
101+
maxFileSize: 104857600,
102+
file: logging_dir + "/alerts.log",
103+
threshold: org.apache.log4j.Level.ERROR,
104+
layout: pattern(conversionPattern: "%d [%c{1}] %m%n")
105105
rollingFile name: "stacktrace", maxFileSize: 1024, file: logging_dir + "/alerts-stacktrace.log"
106106
}
107107
development{
@@ -115,25 +115,25 @@ log4j = {
115115
}
116116

117117
error 'org.codehaus.groovy.grails.web.servlet', // controllers
118-
'org.codehaus.groovy.grails.web.pages', // GSP
119-
'org.codehaus.groovy.grails.web.sitemesh', // layouts
120-
'org.codehaus.groovy.grails.web.mapping.filter', // URL mapping
121-
'org.codehaus.groovy.grails.web.mapping', // URL mapping
122-
'org.codehaus.groovy.grails.commons', // core / classloading
123-
'org.codehaus.groovy.grails.plugins', // plugins
124-
'org.springframework.jdbc',
125-
'org.springframework.transaction',
126-
'org.codehaus.groovy',
127-
'org.grails',
128-
'org.apache',
129-
'grails.spring',
130-
'grails.util.GrailsUtil',
131-
'net.sf.ehcache'
132-
'grails.app.service.org.grails.plugin.resource'
133-
'grails.app.service'
134-
'org.ala'
135-
'au.org.ala'
136-
'grails.app.service.org.grails.plugin.resource.ResourceTagLib'
118+
'org.codehaus.groovy.grails.web.pages', // GSP
119+
'org.codehaus.groovy.grails.web.sitemesh', // layouts
120+
'org.codehaus.groovy.grails.web.mapping.filter', // URL mapping
121+
'org.codehaus.groovy.grails.web.mapping', // URL mapping
122+
'org.codehaus.groovy.grails.commons', // core / classloading
123+
'org.codehaus.groovy.grails.plugins', // plugins
124+
'org.springframework.jdbc',
125+
'org.springframework.transaction',
126+
'org.codehaus.groovy',
127+
'org.grails',
128+
'org.apache',
129+
'grails.spring',
130+
'grails.util.GrailsUtil',
131+
'net.sf.ehcache'
132+
'grails.app.service.org.grails.plugin.resource'
133+
'grails.app.service'
134+
'org.ala'
135+
'au.org.ala'
136+
'grails.app.service.org.grails.plugin.resource.ResourceTagLib'
137137

138138
debug 'au.org.ala.alerts'
139139
}
@@ -150,87 +150,32 @@ postie.emailInfoSender = 'atlas-alerts@ala.org.au'
150150
postie.defaultResourceName = 'Atlas'
151151
postie.enableEmail = true
152152

153-
security.cas.casServerName = 'https://auth.ala.org.au'
154-
security.cas.uriFilterPattern = ''
155-
security.cas.uriExclusionFilterPattern = '/images.*,/css.*,/js.*,/less.*'
156-
security.cas.authenticateOnlyIfLoggedInPattern = "" // pattern for pages that can optionally display info about the logged-in user
157-
security.cas.loginUrl = 'https://auth.ala.org.au/cas/login'
158-
security.cas.logoutUrl = 'https://auth.ala.org.au/cas/logout'
159-
security.cas.casServerUrlPrefix = 'https://auth.ala.org.au/cas'
160-
security.cas.bypass = false
161-
162-
appContext = 'alerts'
163-
ala.baseURL = "http://www.ala.org.au"
164-
bie.baseURL = "http://bie.ala.org.au"
165-
bie.searchPath = "/search"
166153
grails.project.groupId = "au.org.ala" // change this to alter the default package name and Maven publishing destination
167-
ala.userDetailsURL = 'http://auth.ala.org.au/userdetails/userDetails/getUserListFull'
168-
169-
biocache.baseURL = "http://biocache.ala.org.au"
170-
spatial.baseURL = "http://spatial.ala.org.au"
171-
collectory.baseURL = "http://collections.ala.org.au"
172-
173154

174155
environments {
175156
development {
176157
grails.logging.jul.usebridge = true
177-
grails.host = "http://dev.ala.org.au"
178-
grails.serverURL = "${grails.host}:8080/${appContext}"
179-
security.cas.appServerName = "${grails.host}:8080"
180-
security.cas.contextPath = "/${appContext}"
181158
grails.resources.debug = true // cached-resources plugin - keeps original filenames but adds cache-busting params
182159
grails {
183-
mail {
184-
host = "localhost"
185-
port = 1025
186-
username = postie.emailSender
187-
}
160+
mail {
161+
host = "localhost"
162+
port = 1025
163+
username = postie.emailSender
164+
}
188165
}
189166
}
190167
test {
191168
grails.logging.jul.usebridge = false
192-
grails.host = "alerts-test.ala.org.au"
193-
grails.serverURL = "http://alerts-test.ala.org.au"
194-
security.cas.appServerName = grails.serverURL
195-
security.cas.contextPath = ""
196169
log4j.appender.'errors.File'="/var/log/tomcat/alerts-stacktrace.log"
197170
}
198171
production {
199172
grails.logging.jul.usebridge = false
200-
grails.host = "alerts.ala.org.au"
201-
grails.serverURL = "http://${grails.host}"
202-
security.cas.appServerName = grails.serverURL
203-
security.cas.contextPath = ""
204173
grails {
205-
mail {
206-
host = "localhost"
207-
port = 25
208-
username = postie.emailSender
209-
}
210-
}
211-
}
212-
}
213-
214-
// Uncomment and edit the following lines to start using Grails encoding & escaping improvements
215-
216-
/* remove this line
217-
// GSP settings
218-
grails {
219-
views {
220-
gsp {
221-
encoding = 'UTF-8'
222-
htmlcodec = 'xml' // use xml escaping instead of HTML4 escaping
223-
codecs {
224-
expression = 'html' // escapes values inside null
225-
scriptlet = 'none' // escapes output from scriptlets in GSPs
226-
taglib = 'none' // escapes output from taglibs
227-
staticparts = 'none' // escapes output from static template parts
174+
mail {
175+
host = "localhost"
176+
port = 25
177+
username = postie.emailSender
228178
}
229179
}
230-
// escapes all not-encoded output at final stage of outputting
231-
filteringCodecForContentType {
232-
//'text/html' = 'html'
233-
}
234180
}
235181
}
236-
remove this line */

0 commit comments

Comments
 (0)