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

Make global explorers available to initial manifest #169

Merged
merged 2 commits into from
Apr 9, 2013
Merged

Make global explorers available to initial manifest #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a89e64
Make global explorers available to initial manifest and fix hostname …
arkaitzj Mar 31, 2013
0db8018
Updated doc regarding global explorer availability
arkaitzj Apr 2, 2013
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
4 changes: 2 additions & 2 deletions cdist/conf/explorer/hostname
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
#
#

if command -v hostname; then
hostname
if command -v hostname >/dev/null; then
hostname -f
fi
1 change: 1 addition & 0 deletions cdist/core/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def env_initial_manifest(self, initial_manifest):
env.update(self.env)
env['__cdist_manifest'] = initial_manifest
env['__manifest'] = self.local.manifest_path
env['__explorer'] = self.local.global_explorer_out_path

return env

Expand Down
2 changes: 1 addition & 1 deletion docs/man/cdist-reference.text.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ ENVIRONMENT VARIABLES
---------------------
__explorer::
Directory that contains all global explorers.
Available for: explorer, type explorer
Available for: initial manifest, explorer, type explorer
__manifest::
Directory that contains the initial manifest.
Available for: initial manifest, type manifest
Expand Down