From 35edd8c9dd4fbd075bd22a083798cd0ba725a59d Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sat, 30 Jul 2016 20:24:38 -0700 Subject: [PATCH] puppet: Move crudini dependency to base.pp. This allows us to use the new crudini-based zulipconf function in any of our manifests in the future. --- puppet/zulip/manifests/base.pp | 2 ++ puppet/zulip/manifests/postgres_common.pp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp index 4e92bd8d7e..aba3da2802 100644 --- a/puppet/zulip/manifests/base.pp +++ b/puppet/zulip/manifests/base.pp @@ -6,6 +6,8 @@ class zulip::base { "netcat", # Nagios plugins; needed to ensure /var/lib/nagios_plugins exists "nagios-plugins-basic", + # Used to read /etc/zulip/zulip.conf for `zulipconf` puppet function + "crudini", ] package { $base_packages: ensure => "installed" } diff --git a/puppet/zulip/manifests/postgres_common.pp b/puppet/zulip/manifests/postgres_common.pp index 1d3355b18b..8285897603 100644 --- a/puppet/zulip/manifests/postgres_common.pp +++ b/puppet/zulip/manifests/postgres_common.pp @@ -9,8 +9,6 @@ class zulip::postgres_common { "python-dateutil", # TODO: use a virtualenv instead # our dictionary "hunspell-en-us", - # Used to read /etc/zulip/zulip.conf for database backups - "crudini", ] define safepackage ( $ensure = present ) { if !defined(Package[$title]) {