9 files changed, 67 insertions, 7 deletions
diff --git a/sitemodules/roles/manifests/code.pp b/sitemodules/roles/manifests/code.pp
new file mode 100644
index 0000000..f88761a
--- /dev/null
+++ b/sitemodules/roles/manifests/code.pp
@@ -0,0 +1,28 @@
+# Class: roles::code
+# ==================
+#
+# This class defines the code role for a Gitea server used for code hosting.
+# You should assign this class using hiera or via an ENC.
+#
+# Examples
+# --------
+#
+# @example
+#   class { 'roles::code': }
+#
+# Authors
+# -------
+#
+# Jan Dittberner <jandd@cacert.org>
+#
+# Copyright
+# ---------
+#
+# Copyright 2022 Jan Dittberner
+#
+class roles::code {
+  include profiles::base
+  include profiles::rsyslog
+  include profiles::icinga2_agent
+  include profiles::gitea
+}
diff --git a/sitemodules/roles/manifests/emailout.pp b/sitemodules/roles/manifests/emailout.pp
index d6bd462..72901d4 100644
--- a/sitemodules/roles/manifests/emailout.pp
+++ b/sitemodules/roles/manifests/emailout.pp
@@ -18,11 +18,12 @@
 # Copyright
 # ---------
 #
-# Copyright 2018-2019 Jan Dittberner
+# Copyright 2018-2022 Jan Dittberner
 #
 class roles::emailout {
   include profiles::base
   include profiles::rsyslog
   include profiles::purge_nrpe_agent
   include profiles::icinga2_agent
+  include profiles::x509cert_common
 }
diff --git a/sitemodules/roles/manifests/git.pp b/sitemodules/roles/manifests/git.pp
index 55d81b9..ef2393d 100644
--- a/sitemodules/roles/manifests/git.pp
+++ b/sitemodules/roles/manifests/git.pp
@@ -18,11 +18,12 @@
 # Copyright
 # ---------
 #
-# Copyright 2020 Jan Dittberner
+# Copyright 2020-2022 Jan Dittberner
 #
 class roles::git {
   include profiles::base
   include profiles::rsyslog
   include profiles::purge_nrpe_agent
   include profiles::icinga2_agent
+  include profiles::x509cert_common
 }
diff --git a/sitemodules/roles/manifests/ircserver.pp b/sitemodules/roles/manifests/ircserver.pp
index f1ba1a9..c1f627c 100644
--- a/sitemodules/roles/manifests/ircserver.pp
+++ b/sitemodules/roles/manifests/ircserver.pp
@@ -17,11 +17,12 @@
 # Copyright
 # ---------
 #
-# Copyright 2018-2019 Jan Dittberner
+# Copyright 2018-2022 Jan Dittberner
 #
 class roles::ircserver {
   include profiles::base
   include profiles::rsyslog
   include profiles::purge_nrpe_agent
   include profiles::icinga2_agent
+  include profiles::x509cert_common
 }
diff --git a/sitemodules/roles/manifests/issue.pp b/sitemodules/roles/manifests/issue.pp
index eb3b86b..5a6a14d 100644
--- a/sitemodules/roles/manifests/issue.pp
+++ b/sitemodules/roles/manifests/issue.pp
@@ -18,11 +18,12 @@
 # Copyright
 # ---------
 #
-# Copyright 2018-2019 Jan Dittberner
+# Copyright 2018-2022 Jan Dittberner
 #
 class roles::issue {
   include profiles::base
   include profiles::rsyslog
   include profiles::purge_nrpe_agent
   include profiles::icinga2_agent
+  include profiles::x509cert_common
 }
diff --git a/sitemodules/roles/manifests/monitor.pp b/sitemodules/roles/manifests/monitor.pp
index 32f8c96..eea702c 100644
--- a/sitemodules/roles/manifests/monitor.pp
+++ b/sitemodules/roles/manifests/monitor.pp
@@ -18,11 +18,12 @@
 # Copyright
 # ---------
 #
-# Copyright 2018-2019 Jan Dittberner
+# Copyright 2018-2022 Jan Dittberner
 #
 class roles::monitor {
   include profiles::base
   include profiles::rsyslog
   include profiles::purge_nrpe_agent
   include profiles::icinga2_master
+  include profiles::x509cert_common
 }
diff --git a/sitemodules/roles/manifests/pgsql.pp b/sitemodules/roles/manifests/pgsql.pp
index 7b953d0..6e07288 100644
--- a/sitemodules/roles/manifests/pgsql.pp
+++ b/sitemodules/roles/manifests/pgsql.pp
@@ -8,7 +8,7 @@
 # --------
 #
 # @example
-#   class { 'roles::mariadb': }
+#   class { 'roles::pgsql': }
 #
 # Authors
 # -------
diff --git a/sitemodules/roles/manifests/traininginstance.pp b/sitemodules/roles/manifests/traininginstance.pp
new file mode 100644
index 0000000..9cacf78
--- /dev/null
+++ b/sitemodules/roles/manifests/traininginstance.pp
@@ -0,0 +1,26 @@
+# Class: roles::traininginstance
+# ==============================
+#
+# This class defines the traininginstance role for servers providing training
+# environments for CAcert sytem administration volunteers. You should assign
+# this class using hiera or via an ENC.
+#
+# Examples
+# --------
+#
+# @example
+#   class { 'roles::traininginstance': }
+#
+# Authors
+# -------
+#
+# Jan Dittberner <jandd@cacert.org>
+#
+# Copyright
+# ---------
+#
+# Copyright 2020 Jan Dittberner
+#
+class roles::traininginstance {
+  include profiles::base
+}
diff --git a/sitemodules/roles/manifests/translations.pp b/sitemodules/roles/manifests/translations.pp
index 006dd6f..e8d2998 100644
--- a/sitemodules/roles/manifests/translations.pp
+++ b/sitemodules/roles/manifests/translations.pp
@@ -18,7 +18,7 @@
 # Copyright
 # ---------
 #
-# Copyright 2018-2019 Jan Dittberner
+# Copyright 2018-2022 Jan Dittberner
 #
 class roles::translations {
   include profiles::base
@@ -26,4 +26,5 @@ class roles::translations {
   include profiles::purge_nrpe_agent
   include profiles::icinga2_agent
   include profiles::pootle
+  include profiles::x509cert_common
 }