Squashed 'puppet/' changes from 8f7043a..59b7f11

59b7f11 Rollback sshd::print_motd
29e15a3 Set sshd::print_motd to yes
8a13cb5 Post-receive: git submodule sync
d0d65d6 Ignore ssl, unignore modules
662bf5a Exclude also .git at provision_rsync_opts
745b98a Configure provision_rsync_opts at kvmxfile
1434057 Set default backupninja::keystore
36de179 Use scripts from /etc/puppet at kvmxfile provision_command
fe2d343 Fixes provision_command at kvmxfile
0a45a48 Use puppet hostname at kvmxfile
e3a3408 Updates kvmxfile
8648b94 Adds kvmxfile
07b03c2 Deploy: check for sudo config
c6414a8 Removes examples
6507997 Cleanup manifests
e867618 Fetch submodules using https
ee8938e Use projects.list on mrconfig
9e67e02 Support for compiled config
ceddd20 Cleanup TODO
6dad16a Adds modules folder
6f98b51 Updates hiera mount location
48f2491 Removes templates
319bdcb Cleanup modules folder
84516c6 Updates TODO
a43c2f9 Updates README
ca1735f Updates TODO
a67e9d4 TODO: vagrant issues
2838e86 Updates TODO
9662168 Updates TODO
afa676d Rename default box
58b18e5 Updates TODO
20858dc Updates TODO
cd876e6 Default eyaml extension
3645ef8 Adds eyaml backend into hiera config
158f12a Adds hiera-eyaml into DEVELOP_DEPENDENCIES
ec33fd1 Adds keys into .gitignore
490f2e2 Adds hiera-eyaml into DEPLOY_DEPENDENCIES
7d1fc96 Fix site_users inheritance
80088c7 Remove usb-utils from deployment dependencies
03764c2 Deploy: check for rsync
5eb3983 Updates git vhost
739c79f Test deployment without git reset
c8a14ca Preload HSTS
e096f08 Deploy: setup DEPLOY_DEPENDENCIES
0a4a8cc Config cleanup
ace1840 Do not install storedconfigs dependencies on provision
b83d85a Check for puppet.conf on provision
54c68a0 Default SSH config
56e4bea Updates TODO
51c1763 Comment wheezy dependencies specifics
3cc7d47 Removes key folder
41b8ef0 Fix deploy dependencies
64b8d70 Deploy dependencies, TODO update
6051509 Cleanup storedconfigs dependencies
1cf6e4b TODO ordering
9de3634 Updates TODO
2cf2a3b Drop pear
4048095 Get rid of storedconfigs
2eeb10b Updates TODO
e678885 Fix manifest lookup on deployment
9078cac Updates Vagrantfile with new config folder
0cb845b Updates TODO
b75d0f3 Rename 'hiera' to 'config'
ae7cfbd Updates TODO
28e3e25 Cleanup unused, old and broken submodules
deaf0de Updates TODO
c33d108 Updates TODO
15abd2e Removes post-update hook
8a14f6d Deploy: dependency: augeas-tools
c71aa65 Updates TODO
4c5f117 Development dependencies
73d6006 Deploy: dependencies in a single place
364912a Adds examples
85d41ce Hiera cleanup
e4d5f1b Updates TODO
08bd8b7 Deploy fixes
15c0293 TODO cleanup
51b910e Updates TODO
4580c2e Updates TODO
69d46bf More TODO cleanup
0c91d41 More TODO cleanup
cee91df More TODO cleanup
082c901 Updates TODO cleanup
d088390 Updates TODO
d721391 Updates TODO
6ec4ac1 Updates TODO
ebfed6b About collected resources patch
3529cff Updates TODO
701ed3b Removes post-update hook
4a684e7 Updates TODO
4b85c5e Updates TODO
b50dbb6 Removes icecast module
907ffde Deploy: support for default.pp
dc8de77 Cleanup proxy template

git-subtree-dir: puppet
git-subtree-split: 59b7f114e4db75aa3d134b8d2d8a3a36271f37d7

1 files changed, 9 insertions, 5 deletions

diff --git a/bin/deploy b/bin/deploy
index 5d3361b..22065dc 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -6,7 +6,6 @@
 # Parameters
 DIRNAME="`dirname $0`"
 BASEDIR="$DIRNAME/.."
-DEPLOY_DEPENDENCIES="puppet ruby-sqlite3 ruby-activerecord ruby-activerecord-deprecated-finders"
 
 # Determine hostname
 if [ ! -z "$1" ]; then
@@ -15,10 +14,15 @@ else
   FQDN="`cat /etc/hostname`"
 fi
 
-# Check for manifest
-PUPPET_MANIFEST="$BASEDIR/puppet/manifests/nodes/$FQDN.pp"
+# Set manifest
+PUPPET_MANIFEST="$BASEDIR/manifests/nodes/$FQDN.pp"
 if [ ! -e "$PUPPET_MANIFEST" ]; then
-  echo "file not found: $PUPPET_MANIFEST"
+  PUPPET_MANIFEST="$BASEDIR/manifests/nodes/default.pp"
+fi
+
+# Check manifest
+if [ ! -e "$PUPPET_MANIFEST" ]; then
+  echo "No manifest found for $FQDN"
   exit 1
 fi
 
@@ -54,5 +58,5 @@ if [ -d "$BASEDIR/puppet/files/patches/$DIST" ]; then
 fi
 
 # Run puppet apply
-PUPPET_OPTS="--confdir=$BASEDIR/puppet --modulepath=$BASEDIR/puppet/modules"
+PUPPET_OPTS="--confdir=$BASEDIR --modulepath=$BASEDIR/modules"
 LC_ALL=C $SUDO puppet apply $PUPPET_OPTS $PUPPET_MANIFEST