Skip to content

Commit

Permalink
Make camptocamp/systemd a hard dependency
Browse files Browse the repository at this point in the history
8bc1ba3 made the default deployment use
the Puma service. That means the default requires systemd and a soft
dependency no longer makes sense.

It also updates the documentation in README to match.
  • Loading branch information
ekohl authored and mmoll committed Apr 16, 2020
1 parent 7a19261 commit eaf2fcb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
13 changes: 2 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ Many Foreman plugins can be installed by adding additional `foreman::plugin::*`
classes, extra compute resource support via `foreman::compute::*` classes and
the Hammer CLI can be installed by adding `foreman::cli`.

By default, it configures Foreman to run under Apache and Passenger plus
with a PostgreSQL database. A standalone service can be configured instead by
setting `passenger` to false, though this isn't recommended in production.
By default, it configures Foreman to run as a standalone service fronted by
Apache as a reverse proxy with a PostgreSQL database.

The web interface is configured to use Puppet's SSL certificates by default, so
ensure they're present first, reconfigure `server_ssl_*` or disable the `ssl`
Expand Down Expand Up @@ -48,14 +47,6 @@ previous stable release.

This module targets Foreman 2.0+.

## Running without passenger

To use this module without passenger, the `passenger` parameter must be set to
`false`. This will install the `foreman-service` package and ensure the service
is running.

This introduces a soft dependency on `camptocamp-systemd`.

## Types and providers

`foreman_config_entry` can be used to manage settings in Foreman's database, as
Expand Down
4 changes: 4 additions & 0 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
"foreman"
],
"dependencies": [
{
"name": "camptocamp/systemd",
"version_requirement": ">= 2.2.0 < 3.0.0"
},
{
"name": "puppetlabs/apache",
"version_requirement": ">= 2.0.0 < 6.0.0"
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
install_module_on(hosts)
install_module_dependencies_on(hosts)
install_module_from_forge('camptocamp-systemd', '>= 1.0.0')

RSpec.configure do |c|
# Readable test descriptions
Expand Down

0 comments on commit eaf2fcb

Please sign in to comment.