Skip to content
This repository has been archived by the owner on Nov 24, 2020. It is now read-only.

Commit

Permalink
Fixed problem with flickr
Browse files Browse the repository at this point in the history
  • Loading branch information
ngiger committed Jun 28, 2013
1 parent 78076d7 commit fcd6b88
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion readme.textile
Expand Up @@ -28,7 +28,8 @@ bc. "::oddb_org::mail::smtp_host": smtp.provider.net:port
'::oddb_org::mail_to': b_user@ywesee.com
'::oddb_org::root_name': a_user@ywesee.com
'::oddb_org::root_pw': topsecret_password

'::oddb_org::flickr_shared_secret': topsecret_password
'::oddb_org::flickr_api_key': topsecret_key

h3. Download an actual dump of the database

Expand Down
8 changes: 7 additions & 1 deletion static-modules/oddb_org/manifests/mail.pp
Expand Up @@ -6,8 +6,10 @@
$mail_to = hiera('::oddb_org::mail_to', 'put mail_to into hiera-data/private/config.yaml'),
$email_password = hiera('::oddb_org::mail::password', 'put your password into hiera-data/private/config.yaml'),
$mail_smtp_host = hiera('::oddb_org::mail::smtp_host', 'put your smtp_host into hiera-data/private/config.yaml'),
$flickr_shared_secret = hiera('::oddb_org::flickr_shared_secret', 'put your flickr_shared_secret into hiera-data/private/config.yaml'),
$flickr_api_key = hiera('::oddb_org::flickr_api_key', 'put your flickr_api_key into hiera-data/private/config.yaml'),
$oddb_yml = "$ODDB_HOME/etc/oddb.yml", # needed of oddb_org::all

) inherits oddb_org::oddb_git {
$mail_package = 'ssmtp'
file { '/etc/puppet/private':
Expand Down Expand Up @@ -61,6 +63,10 @@
text_info_searchform2: http://compendium.ch/search/de
testenvironment1: /var/www/oddb.org/test/testenvironment1.rb
testenvironment2: /var/www/oddb.org/test/testenvironment2.rb
interaction_key: 'OD3DJ2EZ68LAZYL'
flickr_shared_secret: '$flickr_shared_secret'
flickr_api_key: '$flickr_api_key'
app_user_agent: 'org.oddb.generikacc'
",
owner => 'root',
group => 'root',
Expand Down

0 comments on commit fcd6b88

Please sign in to comment.