Skip to content

Commit

Permalink
ready for testing on vagrant after some cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
micrub committed Sep 29, 2011
1 parent 54fc89c commit 46496ff
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 131 deletions.
2 changes: 1 addition & 1 deletion README.textile
@@ -1,2 +1,2 @@
LAMP Puppet Manifests for CentOS 5/Ubuntu
LAMP Puppet Manifests for Ubuntu/Debian

25 changes: 11 additions & 14 deletions manifests/classes/apache.pp
@@ -1,23 +1,20 @@
class apache {

package { httpd: ensure => installed }
package { httpd-devel: ensure => installed }
package { mod_ssl: ensure => installed }

package { 'apache2' : ensure => installed }

service {
httpd:
'apache2' :
enable => true,
ensure => running,
subscribe => [Package[httpd], File["/etc/httpd/conf/httpd.conf"], Package[php], File["/etc/php.ini"]]
subscribe => [Package['apache2']]
}

file { "/etc/httpd/conf/httpd.conf":
owner => root,
group => root,
mode => 660,
source => "/etc/puppet/files/etc/httpd/conf/httpd.conf",
require => [ Package[httpd] ]
}
#file { "/etc/httpd/conf/httpd.conf":
# owner => root,
# group => root,
# mode => 660,
# source => "/etc/puppet/files/etc/httpd/conf/httpd.conf",
# require => [ Package[httpd] ]
#}

}
}
4 changes: 0 additions & 4 deletions manifests/classes/build.pp

This file was deleted.

44 changes: 0 additions & 44 deletions manifests/classes/git.pp

This file was deleted.

10 changes: 3 additions & 7 deletions manifests/classes/lamp.pp
@@ -1,10 +1,6 @@
class lamp {
include build,
ssh,
svn,
git,
include
apache,
mysql,
php,
sudo
}
mysql,
}
29 changes: 12 additions & 17 deletions manifests/classes/mysql.pp
@@ -1,21 +1,16 @@
class mysql {

package { mysql: ensure => installed }
package { mysql-server: ensure => installed }

service {
mysqld:
enable => true,
ensure => running,
subscribe => Package[mysql-server]
package {
mysql-server: ensure => installed ,
libapache2-mod-auth-mysql: ensure => installed,
php5-mysql: ensure=>installed,
phpmyadmin: ensure=>installed,
}

file { "/etc/my.cnf":
owner => root,
group => root,
mode => 660,
source => "/etc/puppet/files/etc/my.cnf",
require => [ Package[mysql-server] ]
}
#service {
# mysqld:
# enable => true,
# ensure => running,
# subscribe => Package[mysql-server]
#}

}
}
14 changes: 4 additions & 10 deletions manifests/classes/php.pp
@@ -1,14 +1,8 @@
class php {

package { php: ensure => installed }
package { php-mysql: ensure => installed }

file { "/etc/php.ini":
owner => root,
group => root,
mode => 660,
source => "/etc/puppet/files/etc/php.ini",
require => [ Package[php] ]
package {
php5 : ensure => installed,
libapache2-mod-php5 : ensure => installed,
}

}
}
20 changes: 0 additions & 20 deletions manifests/classes/ssh.pp

This file was deleted.

11 changes: 0 additions & 11 deletions manifests/classes/sudo.pp

This file was deleted.

3 changes: 0 additions & 3 deletions manifests/classes/svn.pp

This file was deleted.

0 comments on commit 46496ff

Please sign in to comment.