From 974878019224869908bf014fa3363a3dd7b217f1 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Sat, 26 Sep 2015 21:26:50 -0700
Subject: [PATCH] Remove unnecessary puppet.conf configuration.

Fixes #23.
---
 puppet/zulip/files/puppet.conf  | 22 ----------------------
 puppet/zulip/manifests/base.pp  |  8 --------
 scripts/lib/install             |  1 -
 scripts/zulip-puppet-apply      |  2 +-
 tools/deprecated/install-server |  2 --
 5 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 puppet/zulip/files/puppet.conf

diff --git a/puppet/zulip/files/puppet.conf b/puppet/zulip/files/puppet.conf
deleted file mode 100644
index a7e6f5d433..0000000000
--- a/puppet/zulip/files/puppet.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[main]
-  server = puppet.zulip.com
-  environment = production
-  confdir = /etc/puppet
-  logdir=/var/log/puppet
-  vardir=/var/lib/puppet
-  ssldir=/var/lib/puppet/ssl
-  rundir=/var/run/puppet
-  factpath=$vardir/lib/facter
-  templatedir=$confdir/templates
-  prerun_command=/etc/puppet/etckeeper-commit-pre
-  postrun_command=/etc/puppet/etckeeper-commit-post
-  modulepath = /root/zulip/puppet:/etc/puppet/modules:/usr/share/puppet/modules
-
-[master]
-  environment = production
-  manifest    = $confdir/environments/$environment/manifests/site.pp
-  modulepath  = $confdir/environments/$environment/modules
-[agent]
-  report = true
-  show_diff = true
-  environment = production
diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp
index ff80d665ad..38655cd35c 100644
--- a/puppet/zulip/manifests/base.pp
+++ b/puppet/zulip/manifests/base.pp
@@ -40,14 +40,6 @@ class zulip::base {
     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
index 6f85bc81c4..c0c9e5e2a3 100755
--- 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
index ae944ffb65..c948d384fa 100755
--- 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
index 404b47112f..795620328c 100755
--- 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