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

Fixes #9865: Move hooks to /opt/rudder/etc/ #1412

Merged
merged 1 commit into from Dec 29, 2016
Merged

Fixes #9865: Move hooks to /opt/rudder/etc/ #1412

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...c/test/scala/com/normation/rudder/services/policies/write/WriteSystemTechniquesTest.scala
View file
Open in desktop
Expand Up @@ -212,7 +212,7 @@ class WriteSystemTechniqueTest extends Specification with Loggable with ContentM
, logNodeConfig
, prepareTemplateVariable
, new FillTemplatesService()
, "/var/rudder/hooks.d"
, "/opt/rudder/etc/hooks.d"
Copy link
Member Author

Choose a reason for hiding this comment

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

Really unsure about this one, no idea what it does.

)

//////////// end init ////////////
Expand Down
4 changes: 2 additions & 2 deletions rudder-web/src/main/resources/configuration.properties.sample
View file
Open in desktop
Expand Up @@ -545,7 +545,7 @@ rudder.server-roles.cfengine-mission-portal=autodetect
#
# Command line tools used to check the validity of generated promises
# DEPRECATED: that command isn't use anymore. Please use a hook into
# /opt/rudder/hooks.d/node-policy-generated for that
# /opt/rudder/etc/hooks.d/node-policy-generated for that
#
rudder.community.checkpromises.command=/var/rudder/cfengine-community/bin/cf-promises
rudder.nova.checkpromises.command=/bin/true
Expand All @@ -554,7 +554,7 @@ rudder.nova.checkpromises.command=/bin/true
# Command to force the server to reload its promises
# This will be run every time promises are regenerated on the root server
# DEPRECATED: that command isn't use anymore. Please use a hook into
# /opt/rudder/hooks.d/policy-generation-finished for that
# /opt/rudder/etc/hooks.d/policy-generation-finished for that
#
rudder.cfengine.reload.server.command=/opt/rudder/bin/rudder-reload-cf-serverd

Expand Down
4 changes: 2 additions & 2 deletions rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
View file
Open in desktop
Expand Up @@ -309,9 +309,9 @@ object RudderConfig extends Loggable {
, RudderServerRole("rudder-cfengine-mission-portal", config.getString("rudder.server-roles.cfengine-mission-portal"))
)

// The base directory for hooks. I'm not sure it need to be configurable
// The base directory for hooks. I'm not sure it needs to be configurable
// as we only use it in generation.
val HOOKS_D = "/opt/rudder/hooks.d"
val HOOKS_D = "/opt/rudder/etc/hooks.d"

val licensesConfiguration = "licenses.xml"
val logentries = "logentries.xml"
Expand Down