Added definition for eyeo.com webserver

modules/web/manifests/server.pp

 class web::server($vhost, $repository) {
   File {
     owner  => 'root',
     group  => 'root',
     mode   => 0644,
   }
 
   Cron {
     environment => ['MAILTO=admin@adblockplus.org', 'PYTHONPATH=/opt/sitescripts'],
   }
 
   include nginx
 
   package {['python-jinja2', 'python-markdown']:}
 
-  file {'/etc/nginx/sites-enabled/default':

[Felix Dahlke, 2013/12/05 06:06:44]

The nginx module already has this.

-    ensure => absent,
-    require => Package['nginx'],
-  }
-
-  file {"/etc/nginx/sites-available/${vhost}":

[Felix Dahlke, 2013/12/05 06:06:44]

Why not use nginx::hostconfig?

+  nginx::hostconfig {$vhost:
     content => template('web/site.erb'),
-    require => Package['nginx'],
-    notify => Service['nginx'],
-  }
-
-  file {"/etc/nginx/sites-enabled/${vhost}":
-    ensure => link,
-    target => "/etc/nginx/sites-available/${vhost}",
-    notify => Service['nginx'],
+    enabled => true,
   }
 
   file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key':

[Felix Dahlke, 2013/12/05 06:06:44]

Shouldn't especially the key have mode 0400?

     ensure => file,
-    require => Package['nginx'],
+    mode => 0400,
+    require => Nginx::Hostconfig[$vhost],
     source => 'puppet:///modules/private/adblockplus.org_sslcert.key',
   }
 
   file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem':
     ensure => file,
     mode => 0400,
-    require => Package['nginx'],
+    require => Nginx::Hostconfig[$vhost],
     source => 'puppet:///modules/private/adblockplus.org_sslcert.pem',
   }
 
   class {'sitescripts':
     sitescriptsini_source => 'puppet:///modules/web/sitescripts',
   }
 
-  user {'wwwuser':

[Felix Dahlke, 2013/12/05 06:06:44]

I'd vote for just 'www' here, that's in line with other single purpose user
names (mail, irc, ...)

+  user {'www':
     ensure => present,
     comment => 'Web content owner',
-    home => '/home/wwwuser',
+    home => '/home/www',
     managehome => true,
   }
 
   exec {"fetch_repo":
-    command => "hg clone -U https://hg.adblockplus.org/${repository} /home/wwwuser/${repository}",
+    command => "hg clone -U https://hg.adblockplus.org/${repository} /home/www/${repository}",
     path => ["/usr/bin/", "/bin/"],
     require => Package['mercurial'],
-    user => wwwuser,
+    user => www,
     timeout => 0,
-    onlyif => "test ! -d /home/wwwuser/${repository}",
+    onlyif => "test ! -d /home/www/${repository}",
   }
 
   file {'/var/www':
     ensure => directory,
     mode => 755,
   }
 
   file {"/var/www/${vhost}":
     ensure => directory,
-    owner => wwwuser,
+    owner => www,
     mode => 755,
   }
 
   cron {'update_repo':
     ensure => present,
-    command => "hg pull -q -R /home/wwwuser/${repository} && python -m sitescripts.cms.bin.generate_static_pages /home/wwwuser/${repository} /var/www/${vhost}",
-    user => wwwuser,
+    command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.cms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}",
+    user => www,
     minute  => '*/10',
   }
 }