diff options
| author | Damien Lallement <dams@mageia.org> | 2010-11-18 09:50:40 +0000 |
|---|---|---|
| committer | Damien Lallement <dams@mageia.org> | 2010-11-18 09:50:40 +0000 |
| commit | 1a23c364be65596297d6e98e35ab6c8efdde63ac (patch) | |
| tree | 163e9ac505cf55736e93e2a0057c08fe21519249 /modules | |
| parent | c3a0e668bec66f847b107e7abc1ff1c215ee3b87 (diff) | |
| download | puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar.gz puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar.bz2 puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar.xz puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.zip | |
Merge two modules: mysql and blog
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/blog/manifests/init.pp | 16 | ||||
| -rw-r--r-- | modules/mysql/manifests/init.pp | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index 1d71e250..a17e5369 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -1,6 +1,20 @@ #TODO: # - add the creation of the user 'blog' in puppet -class blog { +class mysql { + package { 'mysql': + ensure => installed + } + package { 'php-mysql': + ensure => installed + } + + service { mysqld: + ensure => running, + subscribe => Package["mysql"], + } +} + +class check_new-blog-post { package { 'wget': ensure => installed } diff --git a/modules/mysql/manifests/init.pp b/modules/mysql/manifests/init.pp deleted file mode 100644 index f75184c1..00000000 --- a/modules/mysql/manifests/init.pp +++ /dev/null @@ -1,14 +0,0 @@ -class mysql { - - package { 'mysql': - ensure => installed - } - package { 'php-mysql': - ensure => installed - } - - service { mysqld: - ensure => running, - subscribe => Package["mysql"], - } -} |