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

Use librarian-puppet for module dependencies. #11

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 debian/control
Expand Up @@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/brightbox/puppet-git-receiver

Package: puppet-git-receiver
Architecture: all
Depends: ${misc:Depends}, coreutils, bash, puppet (>= 2.7), findutils,
Depends: ${misc:Depends}, coreutils, bash, rubygems, findutils,
tar, git, sudo
Description: Provides a git repo that runs puppet on post-receive
A git post-receive hook script that handles extracting a puppet
Expand Down
1 change: 1 addition & 0 deletions debian/postinst
Expand Up @@ -23,6 +23,7 @@ REPOPATH="$PGRHOME/puppet.git"

case "$1" in
configure)
gem install puppet librarian-puppet
adduser --system \
--quiet \
--home "$PGRHOME" \
Expand Down
2 changes: 1 addition & 1 deletion debian/puppet-git-receiver.sudoers
@@ -1,2 +1,2 @@
puppet-git ALL=NOPASSWD: SETENV:/usr/bin/puppet
puppet-git ALL=NOPASSWD: SETENV:/usr/local/bin/puppet

7 changes: 7 additions & 0 deletions puppet-git-receiver-update-hook
Expand Up @@ -115,6 +115,13 @@ if [ -e $pf_file ] ; then
module_path="$module_path:$pf_path"
fi

lp_file="${DEST}/Puppetfile"

if [ -e $lp_file ] ; then
# FIXME: Inherit verbosity flag from git args
notice "Installing librarian-puppet modules"
(cd $DEST; librarian-puppet install --verbose)
fi

manifest_file="${DEST}/manifests/site.pp"

Expand Down