From d8b084d362c92517bccef0abc02bc40aa2bba06c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jul 2024 12:59:14 +0200 Subject: [PATCH 1/2] replace claranet/timezone with puppet/systemd Fixes: #2101 --- puppet/Puppetfile | 1 - puppet/data/internal.yaml | 1 + puppet/modules/profiles/manifests/base.pp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet/Puppetfile b/puppet/Puppetfile index 7252741b2..ccdc14773 100644 --- a/puppet/Puppetfile +++ b/puppet/Puppetfile @@ -1,6 +1,5 @@ moduledir 'external_modules' -mod 'claranet/timezone', '2.0.1' mod 'puppet/archive', '7.1.0' mod 'puppet/augeasproviders_core', '4.1.0' mod 'puppet/augeasproviders_mounttab', '4.0.0' diff --git a/puppet/data/internal.yaml b/puppet/data/internal.yaml index 2b634aa9c..1411c5fa4 100644 --- a/puppet/data/internal.yaml +++ b/puppet/data/internal.yaml @@ -237,3 +237,4 @@ redmine::https: true apache::default_vhost: false +systemd::timezone: UTC diff --git a/puppet/modules/profiles/manifests/base.pp b/puppet/modules/profiles/manifests/base.pp index 541a2161b..dc9920d2f 100644 --- a/puppet/modules/profiles/manifests/base.pp +++ b/puppet/modules/profiles/manifests/base.pp @@ -4,7 +4,7 @@ include motd include puppet include ssh - include timezone + include systemd include unattended if $facts['os']['family'] == 'RedHat' { package { 'ntp': From 3938a5516739938c87a4f9be553a7ee01dec2045 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 9 Jul 2024 09:28:57 +0200 Subject: [PATCH 2/2] Revert "pin facterdb to 2.x until we fix our modules" This reverts commit 3601e41dc1e637b9c14d455d13d5e2d9a8db72a0. --- puppet/Gemfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/puppet/Gemfile b/puppet/Gemfile index b0a83c430..9297d4816 100644 --- a/puppet/Gemfile +++ b/puppet/Gemfile @@ -21,5 +21,3 @@ gem 'puppet-lint-version_comparison-check', require: false gem 'puppet-syntax', require: false gem 'rspec-puppet', require: false gem 'rspec-puppet-facts', require: false - -gem 'facterdb', '~> 2.0', require: false