Skip to content

Commit

Permalink
Add support for docker based devenv
Browse files Browse the repository at this point in the history
- Add devenv clone target to Makefile
- Update default configs for devenv settings
  • Loading branch information
pfrischmuth committed Jul 21, 2016
1 parent 76f36e2 commit 439b893
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions Makefile
Expand Up @@ -88,6 +88,9 @@ composer-install:
endif
# test stuff

devenv:
git clone "https://github.com/pfrischmuth/ontowiki-devenv.git" devenv

test-directories:
rm -rf application/tests/cache application/tests/unit/cache application/tests/integration/cache
mkdir -p application/tests/cache application/tests/unit/cache application/tests/integration/cache
Expand Down
8 changes: 4 additions & 4 deletions application/tests/config.ini.dist
Expand Up @@ -6,12 +6,12 @@

store.backend = zenddb ; zenddb, virtuoso, multi

store.zenddb.dbname = erfurt_TEST ; needs to end with _TEST
store.zenddb.dbname = ow_TEST ; needs to end with _TEST
store.zenddb.username = php
store.zenddb.password = php
store.zenddb.password = owdev
store.zenddb.dbtype = mysql ; mysql
;store.zenddb.host = localhost ; default is localhost
store.zenddb.host = mysql-test ; default is localhost

store.virtuoso.dsn = VOS_TEST ; needs to end with _TEST
store.virtuoso.username = dba
store.virtuoso.password = dba
store.virtuoso.password = owdev
8 changes: 4 additions & 4 deletions config.ini.dist
Expand Up @@ -25,18 +25,18 @@ store.backend = virtuoso
;;;;
;; ZendDB / MySQL backend specific options
;;
store.zenddb.dbname = "ontowiki"
store.zenddb.dbname = "ontowiki-dev"
store.zenddb.username = "php"
store.zenddb.password = "php"
store.zenddb.password = "owdev"
store.zenddb.dbtype = mysql
store.zenddb.host = localhost
store.zenddb.host = "mysql-dev"

;;;;
;; Virtuoso backend specific options
;;
store.virtuoso.dsn = VOS
store.virtuoso.username = "dba"
store.virtuoso.password = "dba"
store.virtuoso.password = "owdev"
;; affect the main search: searches <= 4 will be exact search (instead of bif:contains)
store.virtuoso.search_max_length_for_bifcontains = "4"
;store.virtuoso.use_persistent_connection = true
Expand Down

0 comments on commit 439b893

Please sign in to comment.