From 1a23c364be65596297d6e98e35ab6c8efdde63ac Mon Sep 17 00:00:00 2001 From: Damien Lallement Date: Thu, 18 Nov 2010 09:50:40 +0000 Subject: Merge two modules: mysql and blog --- manifests/nodes.pp | 3 +-- modules/blog/manifests/init.pp | 16 +++++++++++++++- modules/mysql/manifests/init.pp | 14 -------------- 3 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 modules/mysql/manifests/init.pp diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 5c0cb46a..b758d5f2 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -111,10 +111,9 @@ node champagne { # - setup blog # include default_mageia_server + timezone::timezone { "Europe/Paris": } include apache::base include apache::mod_php - include mysql - timezone::timezone { "Europe/Paris": } include blog } 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"], - } -} -- cgit v1.2.1