Skip to content
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

Jump to bottom

simplify https handling by dropping the profile parameter #2151

Merged
merged 1 commit into from
Nov 15, 2024
Merged

simplify https handling by dropping the profile parameter #2151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions puppet/data/vagrant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ profiles::jenkins::controller::jenkins_job_builder_username: "admin"

profiles::jenkins::node::swap_size_mb: 0

profiles::web::https: false

profiles::repo::deb::https: false
profiles::repo::rpm::https: false

redmine::https: false

web::https: false
9 changes: 0 additions & 9 deletions puppet/modules/profiles/manifests/repo/deb.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,9 @@
#
# @param stable
# Latest release that users expect
#
# @param https
# Whether to enable HTTPS. This is typically wanted but can only be enabled
# in a 2 pass setup. First Apache needs to run for Letsencrypt to function.
# Then Letsencrypt can be enabled. Also useful to turn off in test setups.
class profiles::repo::deb (
String[1] $stable,
Boolean $https = true,
) {
class { 'web':
https => $https,
}
contain web

contain web::vhost::archivedeb
Expand Down
9 changes: 0 additions & 9 deletions puppet/modules/profiles/manifests/repo/rpm.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,9 @@
#
# @param stable_foreman
# Latest Foreman release that users expect
#
# @param https
# Whether to enable HTTPS. This is typically wanted but can only be enabled
# in a 2 pass setup. First Apache needs to run for Letsencrypt to function.
# Then Letsencrypt can be enabled. Also useful to turn off in test setups.
class profiles::repo::rpm (
String[1] $stable_foreman,
Boolean $https = true,
) {
class { 'web':
https => $https,
}
contain web

class { 'web::vhost::rpm':
Expand Down
9 changes: 0 additions & 9 deletions puppet/modules/profiles/manifests/web.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,9 @@
#
# @param stable
# Latest release that users expect
#
# @param https
# Whether to enable HTTPS. This is typically wanted but can only be enabled
# in a 2 pass setup. First Apache needs to run for Letsencrypt to function.
# Then Letsencrypt can be enabled. Also useful to turn off in test setups.
class profiles::web (
String[1] $stable,
Boolean $https = true,
) {
class { 'web':
https => $https,
}
contain web

contain web::vhost::archivedeb
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/web/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# certs are present via the HTTP vhost and only then enable the SSL vhosts.
#
class web(
Boolean $https = false,
Boolean $https = true,
) {
include web::base

Expand Down
6 changes: 0 additions & 6 deletions puppet/spec/classes/profiles_web_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
let(:facts) { os_facts }

it { is_expected.to compile.with_all_deps }

context 'without https' do
let(:params) { { https: false } }

it { is_expected.to compile.with_all_deps }
end
end
end
end