From e957c8adb293fab0b75d9c83c33e69b353805d8c Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Thu, 7 Nov 2013 17:45:07 -0500
Subject: [PATCH] puppet: Move our SSHD config to zulip_internal.

(imported from commit 0c6314963ebe9246d8136dc6db3176d226dc2049)
---
 puppet/zulip/manifests/base.pp                     | 14 --------------
 puppet/{zulip => zulip_internal}/files/sshd_config |  0
 puppet/zulip_internal/manifests/base.pp            | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename puppet/{zulip => zulip_internal}/files/sshd_config (100%)

diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp
index 23212e2274..49c8790252 100644
--- a/puppet/zulip/manifests/base.pp
+++ b/puppet/zulip/manifests/base.pp
@@ -57,20 +57,6 @@ class zulip::base {
     source     => 'puppet:///modules/zulip/apt/apt.conf.d/02periodic',
   }
 
-  file { '/etc/ssh/sshd_config':
-    require    => Package['openssh-server'],
-    ensure     => file,
-    source     => 'puppet:///modules/zulip/sshd_config',
-    owner      => 'root',
-    group      => 'root',
-    mode       => 644,
-  }
-
-  service { 'ssh':
-    ensure     => running,
-    subscribe  => File['/etc/ssh/sshd_config'],
-  }
-
   file { '/var/log/zulip':
     ensure => 'directory',
     owner  => 'zulip',
diff --git a/puppet/zulip/files/sshd_config b/puppet/zulip_internal/files/sshd_config
similarity index 100%
rename from puppet/zulip/files/sshd_config
rename to puppet/zulip_internal/files/sshd_config
diff --git a/puppet/zulip_internal/manifests/base.pp b/puppet/zulip_internal/manifests/base.pp
index e131c1db30..1741dfe2ca 100644
--- a/puppet/zulip_internal/manifests/base.pp
+++ b/puppet/zulip_internal/manifests/base.pp
@@ -20,6 +20,20 @@ class zulip_internal::base {
     mode       => 600,
   }
 
+  file { '/etc/ssh/sshd_config':
+    require    => Package['openssh-server'],
+    ensure     => file,
+    source     => 'puppet:///modules/zulip_internal/sshd_config',
+    owner      => 'root',
+    group      => 'root',
+    mode       => 644,
+  }
+
+  service { 'ssh':
+    ensure     => running,
+    subscribe  => File['/etc/ssh/sshd_config'],
+  }
+
   file { '/root/.ssh/authorized_keys':
     ensure     => file,
     mode       => 600,