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

adjust params and mpm to recent FreeBSD packages #1030

Merged
merged 1 commit into from
Feb 18, 2015
Merged

adjust params and mpm to recent FreeBSD packages #1030

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
5 changes: 1 addition & 4 deletions manifests/mpm.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
$_path = "${lib_path}/${_lib}"
$_id = "mpm_${mpm}_module"

if versioncmp($apache_version, '2.4') >= 0 and
(($::osfamily != 'FreeBSD') or
($::osfamily == 'FreeBSD' and $mpm == 'itk')) {

if versioncmp($apache_version, '2.4') >= 0 {
file { "${mod_dir}/${mpm}.load":
ensure => file,
Copy link
Contributor

Choose a reason for hiding this comment

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

bit confused what this was supposed to check anyway…

path => "${mod_dir}/${mpm}.load",
Expand Down
4 changes: 2 additions & 2 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@
$ssl_certs_dir = '/usr/local/etc/apache24'
$passenger_conf_file = 'passenger.conf'
$passenger_conf_package_file = undef
$passenger_root = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
$passenger_ruby = '/usr/bin/ruby'
$passenger_root = '/usr/local/lib/ruby/gems/2.0/gems/passenger-4.0.58'
Copy link
Contributor

Choose a reason for hiding this comment

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

freebsd 11?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All builds on all supported FreeBSD versions since Ruby 2.0 was made the default (2014-10-08).

The passenger version is also a fast moving target, but I have to think more on how to solve this (maybe also not here, but in the package).

$passenger_ruby = '/usr/local/bin/ruby'
Copy link
Contributor

Choose a reason for hiding this comment

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

how did this ever work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

By using old, 1.9 based packages and symlinking /usr/local/bin/ruby into /usr/bin? :)

$passenger_default_ruby = undef
$suphp_addhandler = 'php5-script'
$suphp_engine = 'off'
Expand Down