/[adm]/puppet/modules/catdap/manifests/init.pp
ViewVC logotype

Diff of /puppet/modules/catdap/manifests/init.pp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2580 by misc, Mon Feb 20 18:34:21 2012 UTC revision 2581 by misc, Sat Mar 17 16:53:36 2012 UTC
# Line 36  class catdap { Line 36  class catdap {
36    
37      $ldap_password = extlookup('catdap_ldap','x')      $ldap_password = extlookup('catdap_ldap','x')
38    
39      define catdap_snapshot($location, $svn_location) {      catdap::snapshot { "identity.$::domain":
         file { "$location/catdap_local.yml":  
             group   => apache,  
             mode    => '0640',  
             content => template('catdap/catdap_local.yml'),  
             require => Subversion::Snapshot[$location],  
         }  
   
         subversion::snapshot { $location:  
             source => $svn_location  
         }  
   
         apache::vhost_catalyst_app { $name:  
             script   => "$location/script/catdap_fastcgi.pl",  
             location => $location,  
             use_ssl  => true,  
         }  
   
         apache::vhost_redirect_ssl { $name: }  
     }  
   
     catdap_snapshot { "identity.$::domain":  
40          location     => '/var/www/identity',          location     => '/var/www/identity',
41          svn_location => "$upstream_svn/branches/live"          svn_location => "$upstream_svn/branches/live"
42      }      }
43    
44      catdap_snapshot { "identity-trunk.$::domain":      catdap::snapshot { "identity-trunk.$::domain":
45          location     => '/var/www/identity-trunk',          location     => '/var/www/identity-trunk',
46          svn_location => "$upstream_svn/trunk"          svn_location => "$upstream_svn/trunk"
47      }      }

Legend:
Removed from v.2580  
changed lines
  Added in v.2581

  ViewVC Help
Powered by ViewVC 1.1.30