Left: | ||
Right: |
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 $database = hiera('rietveld::database', { | |
Felix Dahlke
2015/04/22 05:32:23
Shouldn't we just set engine and name as below in
mathias
2015/04/23 16:28:49
The idea is to have a working development setup wi
Felix Dahlke
2015/05/11 20:10:45
So you mean you'd want to move away from private-s
| |
9 'engine' => 'sqlite3', | |
10 'name' => 'dev.db', | |
11 }), | |
8 ) { | 12 ) { |
9 | 13 |
10 include nginx | 14 include nginx |
11 $django_home = '/home/rietveld/django-gae2django' | 15 $django_home = '/home/rietveld/django-gae2django' |
12 $rietveld_home = "${django_home}/examples/rietveld" | 16 $rietveld_home = "${django_home}/examples/rietveld" |
13 | 17 |
14 Exec { | 18 Exec { |
15 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', | 19 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', |
16 } | 20 } |
17 | 21 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 content => template('rietveld/settings.py.erb'), | 57 content => template('rietveld/settings.py.erb'), |
54 } | 58 } |
55 | 59 |
56 exec {'install_rietveld': | 60 exec {'install_rietveld': |
57 command => "make all", | 61 command => "make all", |
58 cwd => "${rietveld_home}", | 62 cwd => "${rietveld_home}", |
59 user => rietveld, | 63 user => rietveld, |
60 require => [ | 64 require => [ |
61 File["${rietveld_home}/Makefile"], | 65 File["${rietveld_home}/Makefile"], |
62 File["${rietveld_home}/settings.py"]], | 66 File["${rietveld_home}/settings.py"]], |
63 onlyif => "test ! -f ${$rietveld_home}/dev.db", | 67 onlyif => "test ! -e ${$rietveld_home}/gae2django", |
64 } | 68 } |
65 | 69 |
66 file {'/etc/init/rietveld.conf': | 70 file {'/etc/init/rietveld.conf': |
67 ensure => file, | 71 ensure => file, |
68 owner => root, | 72 owner => root, |
69 source => 'puppet:///modules/rietveld/rietveld.conf', | 73 source => 'puppet:///modules/rietveld/rietveld.conf', |
70 notify => Service['rietveld'], | 74 notify => Service['rietveld'], |
71 } | 75 } |
72 | 76 |
73 file {'/etc/init.d/rietveld': | 77 file {'/etc/init.d/rietveld': |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
116 mode => 0640, | 120 mode => 0640, |
117 notify => $ensure ? { | 121 notify => $ensure ? { |
118 present => Exec[$destination], | 122 present => Exec[$destination], |
119 default => [], | 123 default => [], |
120 } | 124 } |
121 } | 125 } |
122 } | 126 } |
123 | 127 |
124 create_resources(rietveld::fixture, $fixtures) | 128 create_resources(rietveld::fixture, $fixtures) |
125 } | 129 } |
OLD | NEW |