puppet: Move our ops repository apt configuration to internal module.

(imported from commit 2aca8e8c2edbd87a77fd5f00b3ae250484721fb4)
This commit is contained in:
Tim Abbott
2013-11-10 09:32:54 -05:00
parent 2b7e4d186a
commit bbf8424b3e
3 changed files with 15 additions and 15 deletions

View File

@@ -19,15 +19,6 @@ class zulip::base {
]
package { $base_packages: ensure => "installed" }
apt::key {"A529EF65":
source => "http://apt.zulip.com/ops.asc",
}
apt::sources_list {"zulip":
ensure => present,
content => 'deb http://apt.zulip.com/ops wheezy main',
}
group { 'zulip':
ensure => present,
gid => '1000',
@@ -63,12 +54,6 @@ class zulip::base {
source => 'puppet:///modules/zulip/limits.conf',
}
file { '/etc/apt/apt.conf.d/02periodic':
ensure => file,
mode => 644,
source => 'puppet:///modules/zulip/apt/apt.conf.d/02periodic',
}
file { '/var/log/zulip':
ensure => 'directory',
owner => 'zulip',

View File

@@ -17,6 +17,21 @@ class zulip_internal::base {
]
package { $org_base_packages: ensure => "installed" }
apt::key {"A529EF65":
source => "http://apt.zulip.com/ops.asc",
}
apt::sources_list {"zulip":
ensure => present,
content => 'deb http://apt.zulip.com/ops wheezy main',
}
file { '/etc/apt/apt.conf.d/02periodic':
ensure => file,
mode => 644,
source => 'puppet:///modules/zulip_internal/apt/apt.conf.d/02periodic',
}
file { '/home/zulip/.ssh/authorized_keys':
ensure => file,
require => File['/home/zulip/.ssh'],