diff --git a/manifests/init.pp b/manifests/init.pp index dd21b38b10b3f86dc8dd3ae16b0ebfddc7772ae0..caac8279f161d971cc224128dfb584a20da17d21 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -313,9 +313,9 @@ class dhrep ( } firewall { '201 allow connections from docker dhrepnet to host': - proto => 'all', - action => 'accept', - source => '172.23.0.0/16', + proto => 'all', + action => 'accept', + source => '172.23.0.0/16', } ### # vagrant cachier changes this to symlink diff --git a/manifests/tools/cli.pp b/manifests/tools/cli.pp index 86bcc30ceabeaa5ba8fdc63f042749aa3b3aa69c..9412a8c609a32d051a7e1eecb029f72b6fcd329c 100644 --- a/manifests/tools/cli.pp +++ b/manifests/tools/cli.pp @@ -3,15 +3,39 @@ # Class for cli-tools, yeah! # class dhrep::tools::cli ( - $scope = undef, + $scope = undef, + $reindex_secret = undef, ) inherits dhrep::params { - if $scope == 'textgrid' { - $_optdir = $::dhrep::params::optdir + $_optdir = $::dhrep::params::optdir + $_confdir = $::dhrep::params::confdir + + package { + 'dhrep-cli-tools': ensure => present; + } + + ### + # config for dhrep-cli (tg: check-consistency/fix-inconsistencies, dh: delete) + ### + file { "${_confdir}/dhrep-cli": + ensure => directory, + owner => root, + group => root, + mode => '0755', + require => File[$_confdir], + } + file { "${_confdir}/dhrep-cli.properties": + mode => '0777', + source => "puppet:///modules/dhrep/etc/dhrep/dhrep-cli/${scope}/dhrep-cli.properties.erb" + } + ### + # SCOPE: TEXTGRID + ### + + if $scope == 'textgrid' { package { - 'xqilla': ensure => present; - 'dhrep-cli-tools': ensure => present; + 'xqilla': ensure => present; } ### diff --git a/templates/etc/dhrep/dhrep-cli/dariah/dhrep-cli.properties.erb b/templates/etc/dhrep/dhrep-cli/dariah/dhrep-cli.properties.erb new file mode 100644 index 0000000000000000000000000000000000000000..cb7adf9fe91ee989aee0190b38f1080e28145579 --- /dev/null +++ b/templates/etc/dhrep/dhrep-cli/dariah/dhrep-cli.properties.erb @@ -0,0 +1,42 @@ +### +# !dhrep-cli configuration file, scope: dariah! +# +# contains pathes to config files needed and variable names to needed settings +### + +# we need localhost for dhcrud, elasticsearch and redis, not docker endpoints fr +om config files! +dhcrud-endpoint=http://localhost:9093/dhcrud-public/ +es-endpoint=http://localhost:9202/dariah-public/metadata +redis-endpoint=http://localhost:6379 + +# handle pids and dois (properties parsing from pid properties) +hdl-config-location=/etc/dhrep/dhpid/pid.properties +hdl-endpoint=handleservice.endpoint +hdl-path=handleservice.path +hdl-prefix=handleservice.prefix +hdl-user=handleservice.user +hdl-passwd=handleservice.pw +doi-config-location=/etc/dhrep/dhpid/pid.properties +doi-endpoint=doi.server +doi-prefix=doi.prefix +doi-user=doi.user +doi-passwd=doi.pw + +# iiifmd caching (properties parsing from iiifmd config) +iiifmd-config-location=/etc/dhrep/iiifmd/iiifmd.properties +iiifmd-cache-dir=cacheDir + +# digilib caching (properties parsing from digilib config) +digilib-config-location=/etc/dhrep/digilib/digilib.properties +digilib-cache-dirs=basedir-list + +# redis db and cr (xml parsing from dhpublish config) +redis-config-location=/etc/dhrep/dhpublish/config.xml +redis-db-no=//field[. = 'redisDatabaseNo']/following-sibling::value/text() +cr-endpoint=//field[. = 'crEndpoint']/following-sibling::value/text() + +# more settings +citation-publisher=DARIAH-DE +citation-doi-resolver=https://doi.org/ +doi-metadata-path=/metadata/ \ No newline at end of file diff --git a/templates/etc/dhrep/dhrep-cli/textgrid/dhrep-cli.properties.erb b/templates/etc/dhrep/dhrep-cli/textgrid/dhrep-cli.properties.erb new file mode 100644 index 0000000000000000000000000000000000000000..98ed6f5933daf54e2e087f54c365791a8b031701 --- /dev/null +++ b/templates/etc/dhrep/dhrep-cli/textgrid/dhrep-cli.properties.erb @@ -0,0 +1,27 @@ +### +# !dhrep-cli configuration file, scope: textgrid! +### + +# NOTE we need localhost for all services, not docker endpoints from config files! + +# elasticsearch settings +elasticSearch.url = localhost +elasticSearch.ports = 9202 +elasticSearch.index = textgrid-nonpublic +elasticSearch.itemLimit = 3000 + +# tgcrud settings +tgcrudPublic.endpoint = http://localhost/1.0/tgcrud-public/rest/ +tgcrudPublic.reindexSecret = <%= @reindex_secret %> + +# tgsearch settings +tgsearchPublic.endpoint = http://localhost/1.0/tgsearch-public/ + +# tgpid settings +tgpid.endpoint = http://localhost/1.0/tgpid/ +tgpid.config = /etc/dhrep/tgpid/pid.properties + +# complete tg metadata path +tgmeta.path = /data/public/productive/ + +# TODO Use one config file for all dhrep-cli-tool properties!