From d132bb2ffbb6f6d5a148db1aa0ad2f3645a3971c Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 15 Nov 2011 13:05:20 +0100 Subject: file renaming to be compliant with recommended module structure. --- manifests/backup.pp | 38 +++++++++++++++++++++++++++++++++++++ manifests/base.pp | 14 ++++++++++++++ manifests/classes/couchdb-backup.pp | 38 ------------------------------------- manifests/classes/couchdb-base.pp | 14 -------------- manifests/classes/couchdb-debian.pp | 7 ------- manifests/classes/couchdb-params.pp | 18 ------------------ manifests/classes/couchdb-redhat.pp | 1 - manifests/debian.pp | 7 +++++++ manifests/init.pp | 2 -- manifests/params.pp | 18 ++++++++++++++++++ manifests/redhat.pp | 1 + 11 files changed, 78 insertions(+), 80 deletions(-) create mode 100644 manifests/backup.pp create mode 100644 manifests/base.pp delete mode 100644 manifests/classes/couchdb-backup.pp delete mode 100644 manifests/classes/couchdb-base.pp delete mode 100644 manifests/classes/couchdb-debian.pp delete mode 100644 manifests/classes/couchdb-params.pp delete mode 100644 manifests/classes/couchdb-redhat.pp create mode 100644 manifests/debian.pp create mode 100644 manifests/params.pp create mode 100644 manifests/redhat.pp diff --git a/manifests/backup.pp b/manifests/backup.pp new file mode 100644 index 0000000..6baea1d --- /dev/null +++ b/manifests/backup.pp @@ -0,0 +1,38 @@ +class couchdb::backup { + + include couchdb::params + + # used in ERB templates + $bind_address = $couchdb::params::bind_address + $port = $couchdb::params::port + $backupdir = $couchdb::params::backupdir + + file {$couchdb::params::backupdir: + ensure => directory, + mode => 755, + require => Package["couchdb"], + } + + file { "/usr/local/sbin/couchdb-backup.py": + ensure => present, + owner => root, + group => root, + mode => 755, + content => template("couchdb/couchdb-backup.py.erb"), + require => [ File[$couchdb::params::backupdir], Exec["install python-couchdb"] ], + } + + cron { "couchdb-backup": + command => "/usr/local/sbin/couchdb-backup.py 2> /dev/null", + hour => 3, + minute => 0, + require => File["/usr/local/sbin/couchdb-backup.py"], + } + + exec {"install python-couchdb": + command => "easy_install couchdb", + require => Package["python-setuptools"], + unless => "grep -q CouchDB-0.8-py2.5.egg /usr/lib/python2.5/site-packages/easy-install.pth" + } + +} diff --git a/manifests/base.pp b/manifests/base.pp new file mode 100644 index 0000000..0671d07 --- /dev/null +++ b/manifests/base.pp @@ -0,0 +1,14 @@ +class couchdb::base { + + package {"couchdb": + ensure => present, + } + + service {"couchdb": + ensure => running, + hasstatus => true, + enable => true, + require => Package["couchdb"], + } + +} diff --git a/manifests/classes/couchdb-backup.pp b/manifests/classes/couchdb-backup.pp deleted file mode 100644 index 6baea1d..0000000 --- a/manifests/classes/couchdb-backup.pp +++ /dev/null @@ -1,38 +0,0 @@ -class couchdb::backup { - - include couchdb::params - - # used in ERB templates - $bind_address = $couchdb::params::bind_address - $port = $couchdb::params::port - $backupdir = $couchdb::params::backupdir - - file {$couchdb::params::backupdir: - ensure => directory, - mode => 755, - require => Package["couchdb"], - } - - file { "/usr/local/sbin/couchdb-backup.py": - ensure => present, - owner => root, - group => root, - mode => 755, - content => template("couchdb/couchdb-backup.py.erb"), - require => [ File[$couchdb::params::backupdir], Exec["install python-couchdb"] ], - } - - cron { "couchdb-backup": - command => "/usr/local/sbin/couchdb-backup.py 2> /dev/null", - hour => 3, - minute => 0, - require => File["/usr/local/sbin/couchdb-backup.py"], - } - - exec {"install python-couchdb": - command => "easy_install couchdb", - require => Package["python-setuptools"], - unless => "grep -q CouchDB-0.8-py2.5.egg /usr/lib/python2.5/site-packages/easy-install.pth" - } - -} diff --git a/manifests/classes/couchdb-base.pp b/manifests/classes/couchdb-base.pp deleted file mode 100644 index 0671d07..0000000 --- a/manifests/classes/couchdb-base.pp +++ /dev/null @@ -1,14 +0,0 @@ -class couchdb::base { - - package {"couchdb": - ensure => present, - } - - service {"couchdb": - ensure => running, - hasstatus => true, - enable => true, - require => Package["couchdb"], - } - -} diff --git a/manifests/classes/couchdb-debian.pp b/manifests/classes/couchdb-debian.pp deleted file mode 100644 index 053d17a..0000000 --- a/manifests/classes/couchdb-debian.pp +++ /dev/null @@ -1,7 +0,0 @@ -class couchdb::debian inherits couchdb::base { - - package {"libjs-jquery": - ensure => present, - } - -} diff --git a/manifests/classes/couchdb-params.pp b/manifests/classes/couchdb-params.pp deleted file mode 100644 index df59ad0..0000000 --- a/manifests/classes/couchdb-params.pp +++ /dev/null @@ -1,18 +0,0 @@ -class couchdb::params { - - $bind_address = $couchdb_bind_address ? { - "" => "127.0.0.1", - default => $couchdb_bind_address, - } - - $port = $couchdb_port ? { - "" => "5984", - default => $couchdb_port, - } - - $backupdir = $couchdb_backupdir ? { - "" => "/var/backups/couchdb", - default => $couchdb_backupdir, - } - -} diff --git a/manifests/classes/couchdb-redhat.pp b/manifests/classes/couchdb-redhat.pp deleted file mode 100644 index defa0a9..0000000 --- a/manifests/classes/couchdb-redhat.pp +++ /dev/null @@ -1 +0,0 @@ -class couchdb::redhat inherits couchdb::base {} diff --git a/manifests/debian.pp b/manifests/debian.pp new file mode 100644 index 0000000..053d17a --- /dev/null +++ b/manifests/debian.pp @@ -0,0 +1,7 @@ +class couchdb::debian inherits couchdb::base { + + package {"libjs-jquery": + ensure => present, + } + +} diff --git a/manifests/init.pp b/manifests/init.pp index edee38b..7d52c59 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,3 @@ -import "classes/*.pp" - class couchdb { case $operatingsystem { Debian: { diff --git a/manifests/params.pp b/manifests/params.pp new file mode 100644 index 0000000..df59ad0 --- /dev/null +++ b/manifests/params.pp @@ -0,0 +1,18 @@ +class couchdb::params { + + $bind_address = $couchdb_bind_address ? { + "" => "127.0.0.1", + default => $couchdb_bind_address, + } + + $port = $couchdb_port ? { + "" => "5984", + default => $couchdb_port, + } + + $backupdir = $couchdb_backupdir ? { + "" => "/var/backups/couchdb", + default => $couchdb_backupdir, + } + +} diff --git a/manifests/redhat.pp b/manifests/redhat.pp new file mode 100644 index 0000000..defa0a9 --- /dev/null +++ b/manifests/redhat.pp @@ -0,0 +1 @@ +class couchdb::redhat inherits couchdb::base {} -- cgit v1.2.3