From 2f4c9417bfcc8020c161c7fad6078e9178f8bcc2 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 10 Mar 2025 11:44:39 +0100
Subject: [PATCH 1/3] fix: remove old messaging artefacts
---
manifests/docker/compose_dariahrep.pp | 1 -
manifests/docker/compose_textgrid.pp | 1 -
manifests/services/iiifmd.pp | 18 --
manifests/services/intern/wildfly.pp | 161 ------------------
manifests/services/oaipmh.pp | 17 --
manifests/services/pid.pp | 17 --
manifests/services/publikator.pp | 17 --
manifests/services/publish.pp | 17 --
manifests/tools/scripts.pp | 1 -
.../compose-dariahrep/docker-compose.yml.epp | 24 ---
.../compose-textgrid/docker-compose.yml.epp | 25 ---
.../opt/dhrep/dariah/check-services.sh.erb | 24 ---
.../opt/dhrep/textgrid/check-services.sh.erb | 24 ---
13 files changed, 347 deletions(-)
delete mode 100644 manifests/services/intern/wildfly.pp
diff --git a/manifests/docker/compose_dariahrep.pp b/manifests/docker/compose_dariahrep.pp
index 411f8a1a..e5e3d58e 100644
--- a/manifests/docker/compose_dariahrep.pp
+++ b/manifests/docker/compose_dariahrep.pp
@@ -120,7 +120,6 @@ class dhrep::docker::compose_dariahrep (
wildfly_config => $::dhrep::params::config['wildfly'],
# flags for new release, such as es7, java17, and new messaging related changes!
es_sieben_active => $::dhrep::services::intern::elasticsearch::es_sieben_active,
- new_messaging => $::dhrep::services::intern::wildfly::new_messaging,
}),
notify => Docker_compose['dariahrep'],
}
diff --git a/manifests/docker/compose_textgrid.pp b/manifests/docker/compose_textgrid.pp
index fa1b6944..cf475f33 100644
--- a/manifests/docker/compose_textgrid.pp
+++ b/manifests/docker/compose_textgrid.pp
@@ -133,7 +133,6 @@ class dhrep::docker::compose_textgrid (
es_workhorse_active => ! $::dhrep::services::intern::elasticsearch::one_node_cluster,
# flags for new release, such as es7, java17, and new messaging related changes!
es_sieben_active => $::dhrep::services::intern::elasticsearch::es_sieben_active,
- new_messaging => $::dhrep::services::intern::wildfly::new_messaging,
}),
notify => Docker_compose['textgrid'],
}
diff --git a/manifests/services/iiifmd.pp b/manifests/services/iiifmd.pp
index 55876b63..a577c133 100644
--- a/manifests/services/iiifmd.pp
+++ b/manifests/services/iiifmd.pp
@@ -16,24 +16,6 @@ class dhrep::services::iiifmd (
$_confdir = $::dhrep::params::confdir
$_vardir = $::dhrep::params::vardir
$_aptdir = $::dhrep::params::aptdir
- #$_catname = $::dhrep::params::config['tomcat_oaipmh']['catname']
-
- ###
- # update apt repo and install package
- ###
- #package { 'tg-iiif-metadata':
- # ensure => $version,
- # require => [Exec['update_dariah_apt_repository'],Usertomcat::Instance[$_catname]],
- #}
-
- ###
- # symlink war from deb package to tomcat webapps dir
- ###
- #file { "/home/${_catname}/${_catname}/webapps/iiifmd":
- # ensure => 'link',
- # target => "${_aptdir}/iiifmd",
- # require => [File["${_confdir}/iiifmd/iiifmd.properties"],Usertomcat::Instance[$_catname]],
- #}
###
# config
diff --git a/manifests/services/intern/wildfly.pp b/manifests/services/intern/wildfly.pp
deleted file mode 100644
index 23aa496f..00000000
--- a/manifests/services/intern/wildfly.pp
+++ /dev/null
@@ -1,161 +0,0 @@
-# == Class: dhrep::services::intern::wildfly
-#
-# === Description
-#
-# Class to install and configure wildfly.
-#
-# === Notes
-#
-# === Parameters
-#
-# [*scope*]
-# textgrid or dariah
-#
-# [*xmx*]
-# xmx mempory usage of the wildfly service
-#
-# [*xms*]
-# xms mempory usage of the wildfly service
-#
-# [*crud_pw*]
-# the password crud is using to send messages to the wildfly messaging service
-#
-class dhrep::services::intern::wildfly (
- $scope = undef,
- $xmx = $dhrep::params::wildfly_xmx,
- $xms = $dhrep::params::wildfly_xms,
- $crud_pw = 'secret',
- $image_name = 'dariah-de/dariah-de-message-beans',
- $image_tag = 'latest',
- $new_messaging = false,
-) inherits dhrep::params {
-
- #$_vardir = $::dhrep::params::vardir
- #$java_home = '/usr/lib/jvm/java-8-openjdk-amd64'
-
- if ($new_messaging == false) {
-
- ###
- # set messaging topic to dh or tg crud
- ###
- if ($scope == 'textgrid') {
- $crud_name = 'tgcrud'
- $crud_topic = 'tgcrudTopic'
- } else {
- $crud_name = 'dhcrud'
- $crud_topic = 'dhcrudTopic'
- }
-
- ###
- # install wildfly
- ###
- #class { 'wildfly':
- # version => '9.0.2',
- # install_source => 'http://download.jboss.org/wildfly/9.0.2.Final/wildfly-9.0.2.Final.tar.gz',
- # java_home => $java_home,
- # dirname => '/home/wildfly/wildfly',
- # mode => 'standalone',
- # config => 'standalone-full.xml',
- # java_xmx => $xmx,
- # java_xms => $xms,
- # java_opts => '-Djava.net.preferIPv4Stack=true',
- # properties => {
- # 'jboss.management.http.port' => '19990',
- # 'jboss.management.https.port' => '19993',
- # 'jboss.http.port' => '18080',
- # 'jboss.https.port' => '18443',
- # 'jboss.ajp.port' => '18009',
- # },
- # # only required if not oracle jdk8...?
- # require => Package['default-jre-headless'],
- # # should be initialised before tomcat_crud...
- # # TODO, how in docker?
- # before => Docker_compose['textgrid'],
- # # before => Service['tomcat-crud'],
- #}
- #-> wildfly::config::app_user { $crud_name:
- # password => $crud_pw,
- #}
- #-> wildfly::config::user_roles { $crud_name:
- # roles => 'guest',
- #}
- #-> wildfly::messaging::topic { $crud_topic:
- # entries => ["topic/${crud_name}","java:jboss/exported/jms/topic/${crud_name}"],
- # TODO, how in docker?
- #notify => [Service['tomcat-crud'], Service['tomcat-publish']],
- #}
-
- ###
- # update apt repo and install package
- ###
- #package { 'message-beans':
- # ensure => latest,
- # require => [Exec['update_dariah_apt_repository'], Class['wildfly']],
- #}
-
- ###
- # symlink war from deb war package to jboss deploy dir
- ###
- #file { '/home/wildfly/wildfly/standalone/deployments/message-beans.war':
- # ensure => 'link',
- # target => '/var/dhrep/webapps/message-beans/message-beans.war',
- # require => Package['message-beans'],
- #}
-
- ###
- # telegraf for wildfly
- ###
- #require 'usertomcat::jolokia'
- #file { '/home/wildfly/wildfly/standalone/deployments/jolokia.war':
- # source => '/var/cache/jolokia.war',
- #}
-
- telegraf::input { 'jolokia2_wildfly':
- plugin_type => 'jolokia2_agent',
- options => [{
- 'urls' => [ 'http://127.0.0.1:18080/jolokia/' ],
- 'name_prefix' => 'wildfly.',
- 'metric' => [{
- 'name' => 'process_cpu_load',
- 'mbean' => 'java.lang:type=OperatingSystem',
- 'paths' => [ 'ProcessCpuLoad' ],
- 'tag_keys' => ['name'],
- },{
- 'name' => 'heap_memory_usage',
- 'mbean' => 'java.lang:type=Memory',
- 'paths' => [ 'HeapMemoryUsage' ],
- 'tag_keys' => ['name'],
- }],
- }],
- }
-
- ###
- # logrotate
- ###
- logrotate::rule { 'wildfly_logrotate':
- path => '/var/log/wildfly/console.log',
- # require => Class['wildfly'],
- rotate => 30,
- rotate_every => 'day',
- compress => true,
- copytruncate => true,
- missingok => true,
- ifempty => true,
- dateext => true,
- dateformat => '.%Y-%m-%d',
- }
-
- ###
- # nrpe
- ###
- nrpe::command { 'check_wildfly_memory':
- ensure => present,
- command => '/usr/lib/nagios/plugins/check_http -H localhost -p 18080 -u /jolokia/read/java.lang:type=Memory -s HeapMemoryUsage -s NonHeapMemoryUsage',
- }
- nrpe::command { 'check_wildfly_uptime':
- ensure => present,
- command => '/usr/lib/nagios/plugins/check_http -H localhost -p 18080 -u /jolokia/read/java.lang:type=Runtime/Uptime -s Uptime',
- }
- }
-
-}
diff --git a/manifests/services/oaipmh.pp b/manifests/services/oaipmh.pp
index 17d78428..2ad118a2 100644
--- a/manifests/services/oaipmh.pp
+++ b/manifests/services/oaipmh.pp
@@ -21,23 +21,6 @@ class dhrep::services::oaipmh (
$templates = "dhrep/etc/dhrep/oaipmh/${scope}"
- ###
- # update apt repo and install package
- ###
- #package { $_name:
- # ensure => $_version,
- # require => [Exec['update_dariah_apt_repository'], Usertomcat::Instance[$_catname]],
- #}
-
- ###
- # symlink war from deb package to tomcat webapps dir
- ###
- #file { "/home/${_catname}/${_catname}/webapps/oaipmh":
- # ensure => 'link',
- # target => "${_aptdir}/oaipmh",
- # require => [File["${_confdir}/oaipmh/oaipmh.properties"], Usertomcat::Instance[$_catname]],
- #}
-
###
# config
###
diff --git a/manifests/services/pid.pp b/manifests/services/pid.pp
index 309c8d6b..87f927ec 100644
--- a/manifests/services/pid.pp
+++ b/manifests/services/pid.pp
@@ -37,23 +37,6 @@ class dhrep::services::pid (
$templates = "dhrep/etc/dhrep/pid/${scope}"
- ###
- # update apt repo and install package
- ###
- #package { $_name:
- # ensure => $_version,
- # require => [Exec['update_dariah_apt_repository'],Usertomcat::Instance[$_catname]],
- #}
-
- ###
- # symlink war from deb package to tomcat webapps dir
- ###
- #file { "/home/${_catname}/${_catname}/webapps/${_short}":
- # ensure => link,
- # target => "${_aptdir}/pid",
- # require => [File["${_confdir}/${_short}/pid.properties"],Usertomcat::Instance[$_catname]],
- #}
-
###
# config
###
diff --git a/manifests/services/publikator.pp b/manifests/services/publikator.pp
index 23aaccbd..3974c57e 100644
--- a/manifests/services/publikator.pp
+++ b/manifests/services/publikator.pp
@@ -61,23 +61,6 @@ class dhrep::services::publikator (
$templates = "dhrep/etc/dhrep/publikator/${scope}"
- ###
- # update apt repo and install package
- ###
- #package { $_name:
- # ensure => $_version,
- # require => [Exec['update_dariah_apt_repository'], Usertomcat::Instance[$_catname]],
- #}
-
- ###
- # symlink war from deb package to tomcat webapps dir
- ###
- #file { "/home/${_catname}/${_catname}/webapps/publikator":
- # ensure => 'link',
- # target => "${_aptdir}/publikator",
- # #require => Usertomcat::Instance[$_catname],
- #}
-
###
# config
###
diff --git a/manifests/services/publish.pp b/manifests/services/publish.pp
index 31657700..a4daa257 100644
--- a/manifests/services/publish.pp
+++ b/manifests/services/publish.pp
@@ -42,23 +42,6 @@ class dhrep::services::publish (
$crud_port = $::dhrep::params::config['tomcat_crud']['http_port'];
$pid_port = $::dhrep::params::config['tomcat_pid']['http_port'];
- ###
- # update apt repo and install package
- ###
- #package { $_name:
- # ensure => $_version,
- # require => [Exec['update_dariah_apt_repository'],Usertomcat::Instance[$_catname]],
- #}
-
- ###
- # symlink war from deb package to tomcat webapps dir
- ###
- #file { "/home/${_user}/${_catname}/webapps/${_short}":
- # ensure => 'link',
- # target => "${_aptdir}/${_short}",
- # require => [File["${_confdir}/${_short}/beans.properties"],Usertomcat::Instance[$_catname]],
- #}
-
###
# config
###
diff --git a/manifests/tools/scripts.pp b/manifests/tools/scripts.pp
index 5c270064..2918672e 100644
--- a/manifests/tools/scripts.pp
+++ b/manifests/tools/scripts.pp
@@ -4,7 +4,6 @@
#
class dhrep::tools::scripts (
$scope = undef,
- $new_messaging = false,
) inherits dhrep::params {
$_optdir = $::dhrep::params::optdir
diff --git a/templates/opt/compose-dariahrep/docker-compose.yml.epp b/templates/opt/compose-dariahrep/docker-compose.yml.epp
index 692b39b2..3c203930 100644
--- a/templates/opt/compose-dariahrep/docker-compose.yml.epp
+++ b/templates/opt/compose-dariahrep/docker-compose.yml.epp
@@ -22,12 +22,7 @@ services:
networks:
- dhrepnet1
depends_on:
-<% if $new_messaging == true { -%>
- message-consumer
-<% } -%>
-<% if $new_messaging == false { -%>
- - wildfly
-<% } -%>
- searchindex-main
publish:
@@ -224,24 +219,6 @@ services:
networks:
- dhrepnet1
-<% if $new_messaging == false { -%>
- # TODO: dhcrud is added as a management user to container, this differs from former puppet setup
- wildfly:
- image: <%= $wildfly_image %>
- restart: always
- environment:
- - JAVA_OPTS=-Xmx<%= $wildfly_config['xmx'] %> -Xms<%= $wildfly_config['xms'] %> -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.http.port=18080
- ports:
- - 18080:18080
- volumes:
- - wildfly_config:/opt/jboss/wildfly/standalone/configuration
- - wildfly_data:/opt/jboss/wildfly/standalone/data
- - etc_dir:/etc/dhrep
- - digilib_prescales:/var/dhrep/digilib/prescale
- networks:
- - dhrepnet1
-<% } -%>
-<% if $new_messaging == true { -%>
artemis:
image: quay.io/artemiscloud/activemq-artemis-broker:0.1.2
ports:
@@ -268,7 +245,6 @@ services:
- digilib_prescales:/var/dhrep/digilib/prescale
depends_on:
- artemis
-<% } -%>
volumes:
elasticsearch-main-data:
diff --git a/templates/opt/compose-textgrid/docker-compose.yml.epp b/templates/opt/compose-textgrid/docker-compose.yml.epp
index 7a5ebb37..8dd7be23 100644
--- a/templates/opt/compose-textgrid/docker-compose.yml.epp
+++ b/templates/opt/compose-textgrid/docker-compose.yml.epp
@@ -21,12 +21,7 @@ services:
networks:
- dhrepnet1
depends_on:
-<% if $new_messaging == true { -%>
- message-consumer
-<% } -%>
-<% if $new_messaging == false { -%>
- - wildfly
-<% } -%>
- searchindex-main
- triplestore
@@ -283,25 +278,6 @@ services:
networks:
- dhrepnet1
-<% if $new_messaging == false { -%>
- # TODO: tgcrud is added as a management user to container, this differs from former puppet setup
- wildfly:
- image: <%= $wildfly_image %>
- restart: always
- environment:
- - JAVA_OPTS=-Xmx<%= $wildfly_config['xmx'] %> -Xms<%= $wildfly_config['xms'] %> -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.http.port=18080
- ports:
- - 18080:18080
- volumes:
- - wildfly_config:/opt/jboss/wildfly/standalone/configuration
- - wildfly_data:/opt/jboss/wildfly/standalone/data
- - etc_dir:/etc/dhrep
- - digilib_prescales:/var/dhrep/digilib/prescale
- - data:/data
- networks:
- - dhrepnet1
-<% } -%>
-<% if $new_messaging == true { -%>
artemis:
image: quay.io/artemiscloud/activemq-artemis-broker:0.1.2
ports:
@@ -329,7 +305,6 @@ services:
- data:/data
depends_on:
- artemis
-<% } -%>
volumes:
elasticsearch-main-data:
diff --git a/templates/opt/dhrep/dariah/check-services.sh.erb b/templates/opt/dhrep/dariah/check-services.sh.erb
index d70586e2..018972f5 100644
--- a/templates/opt/dhrep/dariah/check-services.sh.erb
+++ b/templates/opt/dhrep/dariah/check-services.sh.erb
@@ -161,29 +161,6 @@ else
ERRSTR=$ERRSTR" dhdigilib"
fi
-<% if not @new_messaging -%>
-#
-# wildfly
-#
-FILE="wildfly"
-WILDFLY=$SERVER":18080/jolokia/read/java.lang:type=Runtime/Uptime"
-if $R; then echo "checking "$CSTR"wildfly"$CNRM" (may be obsolete)"$TRN $WILDFLY; fi
-curl -s $WILDFLY > $FILE
-URGL=`grep \"status\":200 $FILE`
-URGL=`echo ${URGL: -13:12}`
-if [ -s $FILE ] && [ "$URGL" = "\"status\":200" ] ; then
- if $R; then echo -n " $OK ["$VSTR; fi
- if $R; then echo -n $URGL; fi
- rm $FILE
- if $R; then echo $CNRM"]"; fi
-else
- if $R; then echo " $FAILED"; fi
- rm $FILE
- ERRORS=true
- ERRSTR=$ERRSTR" dhwildfly"
-fi
-<% end -%>
-<% if @new_messaging -%>
#
# artemis
#
@@ -223,7 +200,6 @@ else
ERRORS=true
ERRSTR=$ERRSTR" message-consumer"
fi
-<% end -%>
#
# iiifmd
diff --git a/templates/opt/dhrep/textgrid/check-services.sh.erb b/templates/opt/dhrep/textgrid/check-services.sh.erb
index a773811f..20c5c218 100644
--- a/templates/opt/dhrep/textgrid/check-services.sh.erb
+++ b/templates/opt/dhrep/textgrid/check-services.sh.erb
@@ -228,29 +228,6 @@ else
ERRSTR=$ERRSTR" tgdigilib"
fi
-<% if not @new_messaging -%>
-#
-# wildfly
-#
-FILE="wildfly"
-WILDFLY=$SERVER":18080/jolokia/read/java.lang:type=Runtime/Uptime"
-if $R; then echo "checking "$CSTR"wildfly"$CNRM" (may be obsolete)"$TRN $WILDFLY; fi
-curl -s $WILDFLY > $FILE
-URGL=`grep \"status\":200 $FILE`
-URGL=`echo ${URGL: -13:12}`
-if [ -s $FILE ] && [ "$URGL" = "\"status\":200" ] ; then
- if $R; then echo -n " $OK ["$VSTR; fi
- if $R; then echo -n $URGL; fi
- rm $FILE
- if $R; then echo $CNRM"]"; fi
-else
- if $R; then echo " $FAILED"; fi
- rm $FILE
- ERRORS=true
- ERRSTR=$ERRSTR" tgwildfly"
-fi
-<% end -%>
-<% if @new_messaging -%>
#
# artemis
#
@@ -290,7 +267,6 @@ else
ERRORS=true
ERRSTR=$ERRSTR" message-consumer"
fi
-<% end -%>
#
# iiifmd
--
GitLab
From 99744c5d522d546b804803066edb8ed8004cc2c9 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 10 Mar 2025 12:07:31 +0100
Subject: [PATCH 2/3] fix: more wildfly removals
---
manifests/docker/compose_dariahrep.pp | 10 ----------
manifests/docker/compose_textgrid.pp | 10 ----------
manifests/init.pp | 11 ++++-------
manifests/params.pp | 19 +------------------
manifests/tools/scripts.pp | 1 -
.../crud-public/dariah/crud.properties.erb | 6 ------
.../crud-public/textgrid/crud.properties.erb | 6 ------
.../etc/dhrep/crud/dariah/crud.properties.erb | 6 ------
.../dhrep/crud/textgrid/crud.properties.erb | 6 ------
.../compose-dariahrep/docker-compose.yml.epp | 2 --
.../compose-textgrid/docker-compose.yml.epp | 2 --
11 files changed, 5 insertions(+), 74 deletions(-)
diff --git a/manifests/docker/compose_dariahrep.pp b/manifests/docker/compose_dariahrep.pp
index e5e3d58e..01412529 100644
--- a/manifests/docker/compose_dariahrep.pp
+++ b/manifests/docker/compose_dariahrep.pp
@@ -65,7 +65,6 @@ class dhrep::docker::compose_dariahrep (
include dhrep::services::fits
include dhrep::services::publikator
include dhrep::services::intern::elasticsearch
- include dhrep::services::intern::wildfly
$_crud_image_name = $::dhrep::services::crud::image_name
$_crud_image_tag = $::dhrep::services::crud::image_tag
@@ -85,8 +84,6 @@ class dhrep::docker::compose_dariahrep (
$_publikator_image_tag = $dhrep::services::publikator::image_tag
$_elasticsearch_image_name = $::dhrep::services::intern::elasticsearch::docker_image_name
$_elasticsearch_image_tag = $::dhrep::services::intern::elasticsearch::docker_image_tag
- $_wildfly_image_name = $dhrep::services::intern::wildfly::image_name
- $_wildfly_image_tag = $dhrep::services::intern::wildfly::image_tag
include dhrep::docker
file { '/opt/dariahrep':
@@ -116,8 +113,6 @@ class dhrep::docker::compose_dariahrep (
elasticsearch_image => "${_elasticsearch_image_name}:${_elasticsearch_image_tag}",
elasticsearch_config => $::dhrep::params::config['elasticsearch'],
elasticsearch_cluster_name => $dhrep::services::intern::elasticsearch::cluster_name,
- wildfly_image => "${docker_image_registry}/${_wildfly_image_name}:${_wildfly_image_tag}",
- wildfly_config => $::dhrep::params::config['wildfly'],
# flags for new release, such as es7, java17, and new messaging related changes!
es_sieben_active => $::dhrep::services::intern::elasticsearch::es_sieben_active,
}),
@@ -169,11 +164,6 @@ class dhrep::docker::compose_dariahrep (
image_tag => $_elasticsearch_image_tag,
before => Docker_compose['dariahrep'],
}
- dhrep::docker::image { "${docker_image_registry}/${_wildfly_image_name}":
- ensure => latest,
- image_tag => $_wildfly_image_tag,
- before => Docker_compose['dariahrep'],
- }
docker_compose { 'dariahrep':
ensure => present,
diff --git a/manifests/docker/compose_textgrid.pp b/manifests/docker/compose_textgrid.pp
index cf475f33..634e5835 100644
--- a/manifests/docker/compose_textgrid.pp
+++ b/manifests/docker/compose_textgrid.pp
@@ -69,7 +69,6 @@ class dhrep::docker::compose_textgrid (
include dhrep::services::fits
include dhrep::services::intern::elasticsearch
include dhrep::services::intern::sesame
- include dhrep::services::intern::wildfly
$_crud_image_name = $::dhrep::services::crud::image_name
$_crud_image_tag = $::dhrep::services::crud::image_tag
@@ -91,8 +90,6 @@ class dhrep::docker::compose_textgrid (
$_elasticsearch_image_tag = $::dhrep::services::intern::elasticsearch::docker_image_tag
$_rdf4j_image_name = $dhrep::services::intern::sesame::docker_image_name
$_rdf4j_image_tag = $dhrep::services::intern::sesame::docker_image_tag
- $_wildfly_image_name = $dhrep::services::intern::wildfly::image_name
- $_wildfly_image_tag = $dhrep::services::intern::wildfly::image_tag
include dhrep::docker
file { '/opt/textgrid':
@@ -126,8 +123,6 @@ class dhrep::docker::compose_textgrid (
elasticsearch_cluster_name => $dhrep::services::intern::elasticsearch::cluster_name,
rdf4j_image => "${docker_image_registry}/${_rdf4j_image_name}:${_rdf4j_image_tag}",
rdf4j_config => $::dhrep::params::config['tomcat_sesame'],
- wildfly_image => "${docker_image_registry}/${_wildfly_image_name}:${_wildfly_image_tag}",
- wildfly_config => $::dhrep::params::config['wildfly'],
datadir => $::dhrep::services::intern::tgdatadirs::docker_data_location,
public_hostname => $::dhrep::public_hostname,
es_workhorse_active => ! $::dhrep::services::intern::elasticsearch::one_node_cluster,
@@ -187,11 +182,6 @@ class dhrep::docker::compose_textgrid (
image_tag => $_rdf4j_image_tag,
before => Docker_compose['textgrid'],
}
- dhrep::docker::image { "${docker_image_registry}/${_wildfly_image_name}":
- ensure => latest,
- image_tag => $_wildfly_image_tag,
- before => Docker_compose['textgrid'],
- }
docker_compose { 'textgrid':
ensure => present,
diff --git a/manifests/init.pp b/manifests/init.pp
index caac8279..8fa4c5eb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -151,9 +151,6 @@ class dhrep (
class { 'dhrep::services::intern::messaging':
scope => $scope,
}
- class { 'dhrep::services::intern::wildfly':
- scope => $scope,
- }
class { 'dhrep::services::iiifmd':
scope => $scope,
}
@@ -191,14 +188,14 @@ class dhrep (
publish_secret => $tgcrud_publish_secret,
log_level => $crud_log_level,
require => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::sesame'],
- Class['dhrep::services::intern::wildfly']],
+ Class['dhrep::services::intern::messaging']],
}
class { 'dhrep::services::crud_public':
scope => $scope,
location => $tgcrud_public_location,
log_level => $crud_public_log_level,
require => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::sesame'],
- Class['dhrep::services::intern::wildfly'], Class['dhrep::services::fits']],
+ Class['dhrep::services::intern::messaging'], Class['dhrep::services::fits']],
}
class { 'dhrep::services::publish':
scope => $scope,
@@ -238,7 +235,7 @@ class dhrep (
storage_host_public => $dhcrud_storage_host_public,
pid_secret => $dhcrud_pid_secret,
log_level => $crud_log_level,
- require => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::wildfly'], Class['dhrep::services::fits']],
+ require => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::messaging'], Class['dhrep::services::fits']],
}
class { 'dhrep::services::crud_public':
scope => $scope,
@@ -247,7 +244,7 @@ class dhrep (
storage_host_public => $dhcrud_public_storage_host_public,
pid_secret => $dhcrud_pid_secret,
log_level => $crud_public_log_level,
- require => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::wildfly']],
+ require => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::messaging']],
}
class { 'dhrep::services::publish':
scope => $scope,
diff --git a/manifests/params.pp b/manifests/params.pp
index 1e23573c..85c7ff4e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -227,8 +227,7 @@ class dhrep::params {
###
# memory profiles: if no hiera entry is found, default to undef, so default
# profile is used
- # NOTE all tomcats except the crud, publish, and wildfly ones are using the
- # servicetomcat's settings!
+ # NOTE all tomcats except crud and publish are using the servicetomcat's settings!
###
case hiera('dhrep::mem_profile', undef) {
'low': {
@@ -254,10 +253,6 @@ class dhrep::params {
'xmx' => '64m',
'xms' => '32m',
},
- 'wildfly' => {
- 'xmx' => '128m',
- 'xms' => '64m',
- },
'iiifmd' => {
'xmx' => '64m',
'xms' => '32m',
@@ -307,10 +302,6 @@ class dhrep::params {
'xmx' => '1792m',
'xms' => '1792m',
},
- 'wildfly' => {
- 'xmx' => '256m',
- 'xms' => '256m',
- },
'iiifmd' => {
'xmx' => '512m',
'xms' => '512m',
@@ -360,10 +351,6 @@ class dhrep::params {
'xmx' => '256m',
'xms' => '32m',
},
- 'wildfly' => {
- 'xmx' => '256m',
- 'xms' => '32m',
- },
'iiifmd' => {
'xmx' => '128m',
'xms' => '32m',
@@ -413,10 +400,6 @@ class dhrep::params {
'xmx' => '256m',
'xms' => '32m',
},
- 'wildfly' => {
- 'xmx' => '384m',
- 'xms' => '32m',
- },
'iiifmd' => {
'xmx' => '512m',
'xms' => '32m',
diff --git a/manifests/tools/scripts.pp b/manifests/tools/scripts.pp
index 2918672e..7d3ebf25 100644
--- a/manifests/tools/scripts.pp
+++ b/manifests/tools/scripts.pp
@@ -26,7 +26,6 @@ class dhrep::tools::scripts (
owner => 'root',
group => 'root',
mode => '0755',
- #require => [File[$_optdir], Class['::dhrep::services::intern::wildfly'], Class['::dhrep::services::intern::elasticsearch']],
require => File[$_optdir],
}
diff --git a/templates/etc/dhrep/crud-public/dariah/crud.properties.erb b/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
index b1e88db2..79707292 100644
--- a/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
+++ b/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
@@ -152,12 +152,6 @@ PUBLISH_SECRET = *
# Settings for the message producer.
USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
MESSAGING_SERVICE_URL = <%= @messaging_url %>
MESSAGING_EVENT_NAME = dhcrud-events
MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb b/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
index 7390fc41..03cf3bb4 100644
--- a/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
+++ b/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
@@ -114,12 +114,6 @@ REINDEX_SECRET = <%= @reindex_secret %>
# Settings for the message producer.
USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
MESSAGING_SERVICE_URL = <%= @messaging_url %>
MESSAGING_EVENT_NAME = tgcrud-events
MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/etc/dhrep/crud/dariah/crud.properties.erb b/templates/etc/dhrep/crud/dariah/crud.properties.erb
index e34620be..c0167775 100644
--- a/templates/etc/dhrep/crud/dariah/crud.properties.erb
+++ b/templates/etc/dhrep/crud/dariah/crud.properties.erb
@@ -152,12 +152,6 @@ PUBLISH_SECRET = *
# Settings for the message producer.
USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
MESSAGING_SERVICE_URL = <%= @messaging_url %>
MESSAGING_EVENT_NAME = dhcrud-events
MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/etc/dhrep/crud/textgrid/crud.properties.erb b/templates/etc/dhrep/crud/textgrid/crud.properties.erb
index 8bdf1884..aacc082a 100644
--- a/templates/etc/dhrep/crud/textgrid/crud.properties.erb
+++ b/templates/etc/dhrep/crud/textgrid/crud.properties.erb
@@ -114,12 +114,6 @@ REINDEX_SECRET = <%= @reindex_secret %>
# Settings for the message producer.
USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
MESSAGING_SERVICE_URL = <%= @messaging_url %>
MESSAGING_EVENT_NAME = tgcrud-events
MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/opt/compose-dariahrep/docker-compose.yml.epp b/templates/opt/compose-dariahrep/docker-compose.yml.epp
index 3c203930..0aed905b 100644
--- a/templates/opt/compose-dariahrep/docker-compose.yml.epp
+++ b/templates/opt/compose-dariahrep/docker-compose.yml.epp
@@ -271,8 +271,6 @@ volumes:
type: none
device: /var/dhrep/digilib/prescale
o: bind
- wildfly_config:
- wildfly_data:
crud_tmp:
networks:
diff --git a/templates/opt/compose-textgrid/docker-compose.yml.epp b/templates/opt/compose-textgrid/docker-compose.yml.epp
index 8dd7be23..c73fbbc7 100644
--- a/templates/opt/compose-textgrid/docker-compose.yml.epp
+++ b/templates/opt/compose-textgrid/docker-compose.yml.epp
@@ -341,8 +341,6 @@ volumes:
device: <%= $datadir %>
o: bind
rdf4j_data:
- wildfly_config:
- wildfly_data:
networks:
dhrepnet1:
--
GitLab
From 548480ad13c209741b7a1d3a323c3fba276a0b4d Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 10 Mar 2025 12:07:59 +0100
Subject: [PATCH 3/3] fix: re-add wildfly.pp
---
manifests/services/intern/wildfly.pp | 32 ++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 manifests/services/intern/wildfly.pp
diff --git a/manifests/services/intern/wildfly.pp b/manifests/services/intern/wildfly.pp
new file mode 100644
index 00000000..f8fe468f
--- /dev/null
+++ b/manifests/services/intern/wildfly.pp
@@ -0,0 +1,32 @@
+# == Class: dhrep::services::intern::wildfly
+#
+# === Description
+#
+# Class to install and configure wildfly.
+#
+# === Notes
+#
+# === Parameters
+#
+# [*scope*]
+# textgrid or dariah
+#
+# [*xmx*]
+# xmx mempory usage of the wildfly service
+#
+# [*xms*]
+# xms mempory usage of the wildfly service
+#
+# [*crud_pw*]
+# the password crud is using to send messages to the wildfly messaging service
+#
+class dhrep::services::intern::wildfly (
+ $scope = undef,
+ $xmx = $dhrep::params::wildfly_xmx,
+ $xms = $dhrep::params::wildfly_xms,
+ $crud_pw = 'secret',
+ $image_name = 'dariah-de/dariah-de-message-beans',
+ $image_tag = 'latest',
+) inherits dhrep::params {
+
+}
--
GitLab