[manual] Switch over to new /etc/zulip/zulip.conf config file

Run the following commands as root before deploying this branch:
 # /root/zulip/tools/migrate-server-config
 # rm /etc/zulip/machinetype /etc/zulip/server /etc/zulip/local /etc/humbug-machinetype /etc/humbug-server /etc/humbug-local

(imported from commit aa7dcc50d2f4792ce33834f14761e76512fca252)
This commit is contained in:
Zev Benjamin
2013-10-31 19:00:30 -04:00
parent e9bd56b5a0
commit 787215d743
10 changed files with 64 additions and 49 deletions

View File

@@ -28,14 +28,6 @@ class zulip-internal::base {
source => 'puppet:///modules/zulip-internal/root_authorized_keys',
}
# This is just an empty file. It's used by the app to test if it's running
# in production.
file { '/etc/zulip/server':
ensure => file,
mode => 644,
content => '',
}
file { '/usr/local/sbin/zulip-ec2-configure-interfaces':
ensure => file,
mode => 755,

View File

@@ -1,14 +1,2 @@
class zulip-internal ($machinetype) {
class { "zulip-internal::$machinetype": }
file { '/etc/zulip/machinetype':
ensure => file,
mode => 644,
content => "$machinetype\n",
}
Exec { path => "/usr/sbin:/usr/bin:/sbin:/bin" }
class {'apt': }
class zulip-internal {
}

View File

@@ -38,14 +38,6 @@ class zulip::local_server {
target => '/home/zulip/deployments/current/prod-static/serve',
}
# This is just an empty file. It's used by the app to test if it's running
# on a local server.
file { '/etc/zulip/local':
ensure => file,
mode => 644,
content => '',
}
file { "/usr/share/postgresql/9.1/tsearch_data/zulip_english.stop":
require => Package["postgresql-9.1"],
ensure => file,