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.

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

SmartOS support #280

Merged
merged 7 commits into from
Mar 24, 2014
Merged

SmartOS support #280

merged 7 commits into from
Mar 24, 2014

Conversation

ok-devalias
Copy link
Contributor

Changes to allow support of Joyent's packaged nginx on SmartOS:

params.pp
Added variable $solaris_nx_daemon_user to toggle between 'www' and 'webservd'.
Added selector to determine $nx_conf_dir value based on $::kernelversion.

nginx.conf.erb
Replaced hardcoded path with scope.lookupvar for nx_conf_dir.

@jfryman
Copy link
Contributor

jfryman commented Mar 24, 2014

Nice! I'd like to merge this, but tests are failing.... can you fix them up?

@ok-devalias
Copy link
Contributor Author

Yup, one errant slash caused the fail. Fixed up and passed.

@jfryman
Copy link
Contributor

jfryman commented Mar 24, 2014

Most excellent!

jfryman pushed a commit that referenced this pull request Mar 24, 2014
@jfryman jfryman merged commit ac0f4ca into voxpupuli:master Mar 24, 2014
cegeka-jenkins pushed a commit to cegeka/puppet-nginx that referenced this pull request Oct 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants