From b10f38755843006da762864b4233bc8f00e76c35 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 5 Nov 2013 13:53:13 -0500 Subject: [PATCH] Rename puppet modules for _/- consistency. (imported from commit 16f139f59af3313a5868c0a7b6d9911b59e40266) --- puppet/zulip-internal/manifests/mediawiki.pp | 2 +- .../manifests/{postgres-appdb.pp => postgres_appdb.pp} | 6 +++--- .../manifests/{postgres-common.pp => postgres_common.pp} | 4 ++-- .../manifests/{postgres-master.pp => postgres_master.pp} | 4 ++-- .../manifests/{postgres-slave.pp => postgres_slave.pp} | 4 ++-- .../manifests/{postgres-appdb.pp => postgres_appdb.pp} | 4 ++-- .../manifests/{postgres-common.pp => postgres_common.pp} | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename puppet/zulip-internal/manifests/{postgres-appdb.pp => postgres_appdb.pp} (69%) rename puppet/zulip-internal/manifests/{postgres-common.pp => postgres_common.pp} (94%) rename puppet/zulip-internal/manifests/{postgres-master.pp => postgres_master.pp} (93%) rename puppet/zulip-internal/manifests/{postgres-slave.pp => postgres_slave.pp} (89%) rename puppet/zulip/manifests/{postgres-appdb.pp => postgres_appdb.pp} (93%) rename puppet/zulip/manifests/{postgres-common.pp => postgres_common.pp} (94%) diff --git a/puppet/zulip-internal/manifests/mediawiki.pp b/puppet/zulip-internal/manifests/mediawiki.pp index ff703f097c..aafd6f64d0 100644 --- a/puppet/zulip-internal/manifests/mediawiki.pp +++ b/puppet/zulip-internal/manifests/mediawiki.pp @@ -1,5 +1,5 @@ class zulip-internal::mediawiki { - include zulip-internal::postgres-common + include zulip-internal::postgres_common $mediawiki_packages = [ "mediawiki", "mediawiki-extensions" ] diff --git a/puppet/zulip-internal/manifests/postgres-appdb.pp b/puppet/zulip-internal/manifests/postgres_appdb.pp similarity index 69% rename from puppet/zulip-internal/manifests/postgres-appdb.pp rename to puppet/zulip-internal/manifests/postgres_appdb.pp index fb0324b228..b933c5d871 100644 --- a/puppet/zulip-internal/manifests/postgres-appdb.pp +++ b/puppet/zulip-internal/manifests/postgres_appdb.pp @@ -1,6 +1,6 @@ -class zulip-internal::postgres-appdb { - include zulip-internal::postgres-common - include zulip::postgres-appdb +class zulip-internal::postgres_appdb { + include zulip-internal::postgres_common + include zulip::postgres_appdb file { "/etc/postgresql/9.1/main/pg_hba.conf": require => Package["postgresql-9.1"], diff --git a/puppet/zulip-internal/manifests/postgres-common.pp b/puppet/zulip-internal/manifests/postgres_common.pp similarity index 94% rename from puppet/zulip-internal/manifests/postgres-common.pp rename to puppet/zulip-internal/manifests/postgres_common.pp index 59e2e099a5..a8790fb07e 100644 --- a/puppet/zulip-internal/manifests/postgres-common.pp +++ b/puppet/zulip-internal/manifests/postgres_common.pp @@ -1,5 +1,5 @@ -class zulip-internal::postgres-common { - include zulip::postgres-common +class zulip-internal::postgres_common { + include zulip::postgres_common exec {"pip_wal-e": command => "/usr/bin/pip install git+git://github.com/zbenjamin/wal-e.git#egg=wal-e", diff --git a/puppet/zulip-internal/manifests/postgres-master.pp b/puppet/zulip-internal/manifests/postgres_master.pp similarity index 93% rename from puppet/zulip-internal/manifests/postgres-master.pp rename to puppet/zulip-internal/manifests/postgres_master.pp index 44a8d68b4c..1adcf45392 100644 --- a/puppet/zulip-internal/manifests/postgres-master.pp +++ b/puppet/zulip-internal/manifests/postgres_master.pp @@ -1,6 +1,6 @@ -class zulip-internal::postgres-master { +class zulip-internal::postgres_master { include zulip-internal::base - include zulip-internal::postgres-appdb + include zulip-internal::postgres_appdb $master_packages = [ "xfsprogs", "mdadm", ] package { $master_packages: ensure => "installed" } diff --git a/puppet/zulip-internal/manifests/postgres-slave.pp b/puppet/zulip-internal/manifests/postgres_slave.pp similarity index 89% rename from puppet/zulip-internal/manifests/postgres-slave.pp rename to puppet/zulip-internal/manifests/postgres_slave.pp index d70d42e3bd..681bb01530 100644 --- a/puppet/zulip-internal/manifests/postgres-slave.pp +++ b/puppet/zulip-internal/manifests/postgres_slave.pp @@ -1,6 +1,6 @@ -class zulip-internal::postgres-slave { +class zulip-internal::postgres_slave { include zulip-internal::base - include zulip-internal::postgres-appdb + include zulip-internal::postgres_appdb # We bundle a bunch of other sysctl parameters into 40-postgresql.conf file { '/etc/sysctl.d/30-postgresql-shm.conf': diff --git a/puppet/zulip/manifests/postgres-appdb.pp b/puppet/zulip/manifests/postgres_appdb.pp similarity index 93% rename from puppet/zulip/manifests/postgres-appdb.pp rename to puppet/zulip/manifests/postgres_appdb.pp index f4615623ae..6687380a61 100644 --- a/puppet/zulip/manifests/postgres-appdb.pp +++ b/puppet/zulip/manifests/postgres_appdb.pp @@ -1,5 +1,5 @@ -class zulip::postgres-appdb { - include zulip::postgres-common +class zulip::postgres_appdb { + include zulip::postgres_common include zulip::supervisor $appdb_packages = [ "python-psycopg2",] diff --git a/puppet/zulip/manifests/postgres-common.pp b/puppet/zulip/manifests/postgres_common.pp similarity index 94% rename from puppet/zulip/manifests/postgres-common.pp rename to puppet/zulip/manifests/postgres_common.pp index 91d52ed9ab..123d5c7a33 100644 --- a/puppet/zulip/manifests/postgres-common.pp +++ b/puppet/zulip/manifests/postgres_common.pp @@ -1,4 +1,4 @@ -class zulip::postgres-common { +class zulip::postgres_common { $postgres_packages = [ "postgresql-9.1", "pgtune", "python-argparse", "python-gevent", "lzop", "pv", "hunspell-en-us", "python-dateutil"]