Merge pull request #414 from lbetz/enhancement/change-module-packages

Change some module package names
voxpupuli · Aug 13, 2024 · 77891b3 · 77891b3
2 parents cae4a8c + 93227f4
commit 77891b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/data/Linux-kernel.yaml b/data/Linux-kernel.yaml
@@ -13,17 +13,17 @@ icingaweb2::conf_group: icingaweb2
 icingaweb2::logging_file: /var/log/icingaweb2/icingaweb2.log
 
 icingaweb2::module::icingadb::package_name: icingadb-web
-icingaweb2::module::director::package_name: icingaweb2-module-director
+icingaweb2::module::director::package_name: icinga-director
 icingaweb2::module::reporting::package_name: icingaweb2-module-reporting
 icingaweb2::module::idoreports::package_name: icingaweb2-module-idoreports
 icingaweb2::module::vspheredb::package_name: icingaweb2-module-vspheredb
-icingaweb2::module::x509::package_name: icingaweb2-module-x509
+icingaweb2::module::x509::package_name: icinga-x509
 icingaweb2::module::audit::package_name: icingaweb2-module-audit
-icingaweb2::module::businessprocess::package_name: icingaweb2-module-businessprocess
-icingaweb2::module::cube::package_name: icingaweb2-module-cube
+icingaweb2::module::businessprocess::package_name: icinga-businessprocess
+icingaweb2::module::cube::package_name: icinga-cube
 icingaweb2::module::elasticsearch::package_name: icingaweb2-module-elasticsearch
 icingaweb2::module::fileshipper::package_name: icingaweb2-module-fileshipper
-icingaweb2::module::generictts::package_name: icingaweb2-module-generictts
-icingaweb2::module::graphite::package_name: icingaweb2-module-graphite
+icingaweb2::module::generictts::package_name: icinga-generictts
+icingaweb2::module::graphite::package_name: icinga-graphite
 icingaweb2::module::pdfexport::package_name: icingaweb2-module-pdfexport
 icingaweb2::module::puppetdb::package_name: icingaweb2-module-puppetdb
diff --git a/data/common.yaml b/data/common.yaml
@@ -86,7 +86,6 @@ icingaweb2::globals::pgsql_x509_schema: /schema/pgsql.schema.sql
 icingaweb2::module::x509::ensure: present
 icingaweb2::module::x509::install_method: git
 icingaweb2::module::x509::git_repository: https://github.com/Icinga/icingaweb2-module-x509.git
-icingaweb2::module::x509::package_name: icingaweb2-module-x509
 icingaweb2::module::x509::manage_service: true
 icingaweb2::module::x509::service_ensure: running
 icingaweb2::module::x509::service_enable: true

diff --git a/spec/classes/modules/x509_spec.rb b/spec/classes/modules/x509_spec.rb
@@ -37,7 +37,6 @@
           is_expected.to contain_icingaweb2__module('x509')
             .with_install_method('git')
             .with_git_revision('v1.3.1')
-            .with_package_name('icingaweb2-module-x509')
         }
 
         it {
@@ -70,22 +69,16 @@
         it { is_expected.not_to contain_exec('import icingaweb2::module::x509 schema') }
       end
 
-      context "#{os} with db_type 'mysql', db_port '4711', install_method 'package', manage_service 'false', import_schema 'true'" do
+      context "#{os} with db_type 'mysql', db_port '4711', manage_service 'false', import_schema 'true'" do
         let(:params) do
           {
-            install_method: 'package',
             manage_service: false,
             db_type: 'mysql',
             db_port: 4711,
             import_schema: true,
           }
         end
 
-        it {
-          is_expected.to contain_package('icingaweb2-module-x509')
-            .with_ensure('installed')
-        }
-
         it {
           is_expected.to contain_icingaweb2__resource__database('x509')
             .with_type('mysql')
@@ -102,21 +95,6 @@
             .with_unless(%r{^mysql.* -Ns -e 'SELECT \* FROM x509_certificate'$})
         }
 
-        it {
-          is_expected.to contain_user('icingax509')
-            .with_ensure('present')
-            .with_gid('bar')
-            .with_shell('/bin/false')
-            .with_system(true)
-        }
-
-        it {
-          is_expected.to contain_systemd__dropin_file('icinga-x509.conf')
-            .with_unit('icinga-x509.service')
-            .with_content(%r{User=icingax509})
-        }
-
-        it { is_expected.not_to contain_systemd__unit_file('icinga-x509.service') }
         it { is_expected.not_to contain_service('icinga-x509') }
       end