| OLD | NEW |
| 1 class rietveld( | 1 class rietveld( |
| 2 $domain, | 2 $domain, |
| 3 $certificate, | 3 $certificate, |
| 4 $private_key, | 4 $private_key, |
| 5 $is_default = false, | 5 $is_default = false, |
| 6 $secret_key = hiera('rietveld::secret_key', ''), | 6 $secret_key = hiera('rietveld::secret_key', ''), |
| 7 $fixtures = hiera('rietveld::fixtures', {}), | 7 $fixtures = hiera('rietveld::fixtures', {}), |
| 8 ) { | 8 ) { |
| 9 | 9 |
| 10 include nginx | 10 include nginx |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 package {['python-django', 'make', 'patch', 'gunicorn']: ensure => present} | 26 package {['python-django', 'make', 'patch', 'gunicorn']: ensure => present} |
| 27 | 27 |
| 28 user {'rietveld': | 28 user {'rietveld': |
| 29 ensure => present, | 29 ensure => present, |
| 30 comment => 'User of the rietveld installation', | 30 comment => 'User of the rietveld installation', |
| 31 home => '/home/rietveld', | 31 home => '/home/rietveld', |
| 32 managehome => true | 32 managehome => true |
| 33 } | 33 } |
| 34 | 34 |
| 35 exec {'get_rietveld': | 35 exec {'get_rietveld': |
| 36 command => "hg clone https://code.google.com/p/django-gae2django/ ${django_h
ome}/", | 36 command => "hg clone https://hg.adblockplus.org/gae2django/ ${django_home}/"
, |
| 37 require => Package['mercurial'], | 37 require => Package['mercurial'], |
| 38 user => rietveld, | 38 user => rietveld, |
| 39 onlyif => "test ! -d ${django_home}", | 39 onlyif => "test ! -d ${django_home}", |
| 40 } | 40 } |
| 41 | 41 |
| 42 file {"${rietveld_home}/Makefile": | 42 file {"${rietveld_home}/Makefile": |
| 43 ensure => file, | 43 ensure => file, |
| 44 owner => rietveld, | 44 owner => rietveld, |
| 45 require => Exec['get_rietveld'], | 45 require => Exec['get_rietveld'], |
| 46 source => 'puppet:///modules/rietveld/Makefile', | 46 source => 'puppet:///modules/rietveld/Makefile', |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 mode => 0640, | 116 mode => 0640, |
| 117 notify => $ensure ? { | 117 notify => $ensure ? { |
| 118 present => Exec[$destination], | 118 present => Exec[$destination], |
| 119 default => [], | 119 default => [], |
| 120 } | 120 } |
| 121 } | 121 } |
| 122 } | 122 } |
| 123 | 123 |
| 124 create_resources(rietveld::fixture, $fixtures) | 124 create_resources(rietveld::fixture, $fixtures) |
| 125 } | 125 } |
| OLD | NEW |