← Back to branch summary

~negronjl/orchestra-puppet-recipes/trunk

« back to all changes in this revision

Viewing changes to puppet/modules/orchestra-apache/manifests/init.pp

  • Committer: Juan L. Negron
  • Date: 2011-04-20 15:47:48 UTC
  • Revision ID: juan.negron@canonical.com-20110420154748-gpr6skkezfu1fc8o
* puppet/modules/orchestra-apache/manifests/init.pp,
  puppet/modules/orchestra-apt/manifests/source.pp,
  puppet/modules/orchestra-distcc/manifests/init.pp,
  puppet/modules/orchestra-glusterfs/manifests/glusterfs-client.pp,
  puppet/modules/orchestra-glusterfs/manifests/glusterfs-server.pp,
  puppet/modules/orchestra-haproxy/manifests/init.pp,
  puppet/modules/orchestra-mpi/manifests/mpi-master.pp,
  puppet/modules/orchestra-mysqlEBS/manifests/init.pp,
  puppet/modules/orchestra-mysqlEBS/manifests/mysqlEBS-base.pp,
  puppet/modules/orchestra-mysqlEBS/manifests/mysqlEBS-master.pp,
  puppet/modules/orchestra-mysql/manifests/mysql-master.pp,
  puppet/modules/orchestra-mysql/manifests/mysql-slave.pp,
  puppet/modules/orchestra-tomcat/manifests/tomcat6.pp:
  - Updated template paths to reflect orchestra namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
puppet/modules/orchestra-apache/manifests/init.pp
21
21
  file{"site_config":
22
22
    name => "/etc/apache2/sites-available/${sitename}",
23
23
    ensure => present,
24
 
    content => template("/etc/puppet/modules/canonical-apache/templates/default.erb"),
 
24
    content => template("/etc/puppet/modules/orchestra-apache/templates/default.erb"),
25
25
    require => Package["apache"],
26
26
    notify => Service["apache"],
27
27
  }
29
29
  file{"port_config":
30
30
    name => "/etc/apache2/conf.d/${sitename}-port-config",
31
31
    ensure => present,
32
 
    content => template("/etc/puppet/modules/canonical-apache/templates/port.erb"),
 
32
    content => template("/etc/puppet/modules/orchestra-apache/templates/port.erb"),
33
33
    require => Package["apache"],
34
34
    notify => Service["apache"],
35
35
  }
36
36
 
37
37
  exec{"disable_default_sites":
38
 
    command => "rm -f /etc/apache2/sites-enabled/default",
 
38
    command => "rm -f /etc/apache2/sites-enabled/000-default",
39
39
    require => [ File["site_config"], File[port_config] ],
40
40
    notify => Service["apache"],
41
41
  }
44
44
    command => "/usr/sbin/a2ensite ${sitename}",
45
45
    require => Exec["disable_default_sites"],
46
46
    notify => Service["apache"],
47
 
    unless => "test -e `ls /etc/apache2/sites-enabled/* | grep ${sitename}`"
 
47
    #unless => "test -e `ls /etc/apache2/sites-enabled/* | grep ${sitename}`"
48
48
  }
49
49
 
50
50
  exec{"haproxy_clustername_directory":
55
55
 
56
56
  @@file{"/etc/haproxy/${clustername}/${sitename}.${uniqueid}.server":
57
57
    ensure => present,
58
 
    content => template("/etc/puppet/modules/canonical-apache/templates/haproxy.erb"),
 
58
    content => template("/etc/puppet/modules/orchestra-apache/templates/haproxy.erb"),
59
59
    tag => "loadbalancer_${clustername}",
60
60
  }
61
61