Remove unnecessary puppet.conf configuration.

Fixes zulip#23.
Shadhopson · Sep 27, 2015 · 9748780 · 9748780
1 parent bc3f096
commit 9748780
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 34 deletions.
diff --git a/puppet/zulip/files/puppet.conf b/puppet/zulip/files/puppet.conf
diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp
@@ -40,14 +40,6 @@
     group      => 'zulip',
   }
 
-  file { '/etc/puppet/puppet.conf':
-    ensure     => file,
-    mode       => 640,
-    owner      => "root",
-    group      => "root",
-    source     => 'puppet:///modules/zulip/puppet.conf',
-  }
-
   file { '/etc/security/limits.conf':
     ensure     => file,
     mode       => 640,

diff --git a/scripts/lib/install b/scripts/lib/install
@@ -13,7 +13,6 @@ EOF
 apt-get update
 apt-get -y dist-upgrade
 apt-get install -y puppet git
-cp -a /root/zulip/puppet/zulip/files/puppet.conf /etc/puppet/
 
 mkdir -p /etc/zulip
 echo -e "[machine]\npuppet_classes = zulip::voyager\ndeploy_type = voyager" > /etc/zulip/zulip.conf

diff --git a/scripts/zulip-puppet-apply b/scripts/zulip-puppet-apply
@@ -23,7 +23,7 @@ include apt
 for pclass in re.split(r'\s*,\s*', config.get('machine', 'puppet_classes')):
     puppet_config += "include %s\n" % (pclass,)
 
-puppet_cmd = ["puppet", "apply", "-e", puppet_config]
+puppet_cmd = ["puppet", "apply", "--modulepath=/root/zulip/puppet", "-e", puppet_config]
 puppet_cmd += extra_args
 
 if force:

diff --git a/tools/deprecated/install-server b/tools/deprecated/install-server
@@ -86,8 +86,6 @@ git checkout $branch
 EOF
 
 ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
-cp -a /root/zulip/puppet/zulip/files/puppet.conf /etc/puppet/
-
 userdel admin
 passwd -d root
 mkdir /etc/zulip