Issue 2867 - Introduce module hgweb and corresponding server role

modules/hgweb/manifests/init.pp

 # == Class: hgweb
 #
 # A hgweb server setup.
 #
 # === Parameters:
 #
 # [*domain*]
 #   The auhority part of the URL the instance is associated with.
 #
 # [*is_default*]
@@ skipping 13 matching lines @@
 #
 # === Examples:
 #
 #   class {'hgweb':
 #     domain => 'localhost',
 #   }
 #
 class hgweb(
   $domain,
   $is_default = false,
-  $certificate = undef,
-  $private_key = undef,
+  $certificate = hiera('hgweb::certificate', 'undef'),
+  $private_key = hiera('hgweb::private_key', 'undef'),
   $hgaccess = 'puppet:///modules/hgweb/hgaccess',
 ) {
 
   include ssh, nginx
 
   $required_packages = ['mercurial-common', 'python-flup', 'spawn-fcgi']
   ensure_packages($required_packages)
 
   class {'sitescripts':
     sitescriptsini_content => template('hgweb/sitescripts.ini.erb'),
   }
 
 
   user {'hg':
     comment => 'hgweb',
     groups => ['www-data'],
     home => '/home/hg',
     managehome => true,
     shell => '/bin/bash',
   }
-
 
   file {'/home/hg/.ssh':
     ensure => 'directory',
     group => 'hg',
     mode => 0750,
     owner => 'hg',
     require => User['hg'],
   }
 
   file {'/home/hg/web':
@@ skipping 19 matching lines @@
     content => template('hgweb/hgrc.erb'),
     group => 'hg',
     mode => 0644,
     owner => 'hg',
     require => [
       Class['sitescripts'],
       Exec['hgaccess_init'],
     ],
   }
 
-
   exec {'hgaccess_init':
     command => 'hg init .',
     creates => '/home/hg/web/hgaccess/.hg',
     cwd => '/home/hg/web/hgaccess',
     logoutput => true,
     path => '/usr/local/bin:/usr/bin:/bin',
     require => File['/home/hg/web/hgaccess'],
     user => 'hg',
   }
 
   exec {'hgaccess_commit':
     command => 'hg add . && hg commit -u Puppet -m "Initial commit"',
     creates => '/home/hg/.ssh/authorized_keys',
     cwd => '/home/hg/web/hgaccess',
     environment => ['PYTHONPATH=/opt/sitescripts'],
     logoutput => true,
     path => '/usr/local/bin:/usr/bin:/bin',
     require => [
       File['/home/hg/web/hgaccess/.hg/hgrc'],
       File['/home/hg/.ssh'],
     ],
     user => 'hg',
   }
 
-
   concat::fragment {'sshd_user_hg':
     content => 'Match User hg
       AllowTcpForwarding no
       X11Forwarding no
       AllowAgentForwarding no
       GatewayPorts no
       ForceCommand cd ~/web && PYTHONPATH=/opt/sitescripts hg-ssh $HGREPOS
     ',
     order => '99',
     target => 'sshd_config',
   }
-
 
   file {'/etc/hgweb.ini':
     mode => 644,
     require => Package[$required_packages],
     source => 'puppet:///modules/hgweb/hgweb.ini',
   }
 
   file {'/opt/hgweb.fcgi':
     mode => 755,
     require => File['/etc/hgweb.ini'],
@@ skipping 18 matching lines @@
     enable => true,
     ensure => 'running',
     hasrestart => true,
     hasstatus => false,
     pattern => 'hgweb.fcgi',
     require => File['/etc/init.d/hgweb'],
     subscribe => File['/etc/hgweb.ini'],
   }
 
   nginx::hostconfig {$domain:
-    certificate => $certificate,
-    content => 'puppet:///modules/hgweb/nginx.conf',
+    certificate => $certificate ? {
+      'undef' => undef,
+      default => $certificate,
+    },
+    source => 'puppet:///modules/hgweb/nginx.conf',
     is_default => $is_default,
     log => 'access_log_hg',
-    private_key => $private_key,
+    private_key => $private_key ? {
+      'undef' => undef,
+      default => $private_key,
+    },
   }
 }