Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOC-XXX][fix] - DB templates: changed properties to genesis.system prefix #890

Merged
merged 1 commit into from Mar 20, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion backend/src/main/resources/defaults-system.json
Expand Up @@ -26,5 +26,7 @@
"genesis.system.metrics": {"default": "true","description": "Gathering of system metrics: on if true, off otherwise",
"restartRequired": true,
"validation": {"Must be true or false": "true|false"}
}
},
"genesis.system.databag.template.repository.path" : {"default" : "templates", "description" : "Filesystem path to databag templates folder", "restartRequired": true},
"genesis.system.databag.template.repository.wildcard": {"default": "*.dbtemplate", "description": "Extension for databag templates files", "restartRequired": true}
}
Expand Up @@ -9,8 +9,8 @@ import com.griddynamics.genesis.repository.impl.DatabagTemplateRepositoryImpl

@Configuration
class DatabagTemplateServiceContextImpl extends DatabagTemplateServiceContext {
@Value("${genesis.databag.template.repository.path:templates}") var templatePath: String = _
@Value("${genesis.databag.template.repository.wildcard:*.dbtemplate}") var wildCard: String = _
@Value("${genesis.system.databag.template.repository.path:templates}") var templatePath: String = _
@Value("${genesis.system.databag.template.repository.wildcard:*.dbtemplate}") var wildCard: String = _

@Bean
def databagTemplateRepository: DatabagTemplateRepository = new DatabagTemplateRepositoryImpl(templatePath, wildCard)
Expand Down
4 changes: 2 additions & 2 deletions test-automation/cucumber/sample.properties.erb
Expand Up @@ -10,5 +10,5 @@ genesis.template.repository.fs.path=<%= Dir.pwd %>/templates
genesis.web.admin.sha.password=<%= hash %>
genesis.web.admin.username=<%= user %>
genesis.system.security.environment.restriction.enabled=true
genesis.databag.template.repository.path=<%= Dir.pwd %>/templates
genesis.databag.template.repository.wildcard=*.dbtemplate
genesis.system.databag.template.repository.path=<%= Dir.pwd %>/templates
genesis.system.databag.template.repository.wildcard=*.dbtemplate