Skip to content

Support new non-AIO puppet Debian packages #868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 16, 2023
Merged

Support new non-AIO puppet Debian packages #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f09003f
Support new non-AIO puppetserver Debian package
jcharaoui Mar 11, 2023
6739538
client package is puppet-agent on debian 12+
jcharaoui Mar 23, 2023
4a6a4b9
use versioncmp
jcharaoui Mar 30, 2023
9bccdcc
make linter happy
jcharaoui May 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,21 @@
$vardir = '/var/lib/puppet'
$sharedir = '/usr/share/puppet'
$bindir = '/usr/bin'
$server_puppetserver_dir = '/etc/puppetserver'
$server_puppetserver_vardir = $vardir
$server_puppetserver_rundir = undef
$server_puppetserver_logdir = undef
$server_ruby_load_paths = []
$server_jruby_gem_home = '/var/lib/puppet/jruby-gems'
if $facts['os']['family'] == 'Debian' {
$server_puppetserver_dir = '/etc/puppet/puppetserver'
$server_puppetserver_vardir = '/var/lib/puppetserver'
$server_puppetserver_rundir = '/run/puppetserver'
$server_puppetserver_logdir = '/var/log/puppetserver'
$server_ruby_load_paths = ['/usr/lib/puppetserver/ruby/vendor_ruby']
$server_jruby_gem_home = '/var/lib/puppetserver/jruby-gems'
} else {
$server_puppetserver_dir = '/etc/puppetserver'
$server_puppetserver_vardir = $vardir
$server_puppetserver_rundir = undef
$server_puppetserver_logdir = undef
$server_ruby_load_paths = []
$server_jruby_gem_home = '/var/lib/puppet/jruby-gems'
}
}
$root_group = undef
$puppetconf_mode = '0644'
Expand Down Expand Up @@ -272,7 +281,8 @@
$server_ssl_dir = $ssldir
$server_version = undef

if $aio_package {
if $aio_package or
($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '12') >= 0) {
$client_package = ['puppet-agent']
} elsif ($facts['os']['family'] =~ /(FreeBSD|DragonFly)/) {
$client_package = ["puppet${puppet_major}"]
Expand Down
2 changes: 2 additions & 0 deletions manifests/server/puppetserver.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@
context => '/files/etc/rc.conf',
changes => ["set puppetserver_java_opts '\"${jvm_cmd}\"'"],
}
} elsif $facts['os']['family'] == 'Debian' and !$puppet::params::aio_package {
$server_gem_paths = ['${jruby-puppet.gem-home}', '/usr/lib/puppetserver/vendored-jruby-gems'] # lint:ignore:single_quote_string_with_variables
Copy link
Member

@ekohl ekohl Mar 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given the repetition in declaring a vendored-jruby-gems dir, is this something that belongs in params.pp?

Copy link
Contributor Author

@jcharaoui jcharaoui Mar 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Declaring $server_gem_paths in puppet::params was my first idea too, however it doesn't work because the variable isn't a class parameter of puppet::server::puppetserver.

} else {
if $jvm_cli_args {
$changes = [
Expand Down