From 95857ebcf57fccf79b932932fe9d29370a3ae06e Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Thu, 26 Feb 2015 12:54:56 +0100
Subject: [PATCH] Get cron key variable from conf parameter

Remove the deprecated conf_cron_key from cron resource.

Change-Id: Ie65b88786b9cbd61b1af9657052ce57c9aaa1fd1
---
 manifests/init.pp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4529b78..6bffb76 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -50,7 +50,6 @@
 #
 # Drupal configuration variables:
 # - conf: contains the key-value pairs of settings.php
-# - conf_cron_key: cron_key setting used for cron access
 #
 # Remarks:
 # - the site lives in /srv/vhosts/{hostname}/slot0 or slot1 directory
@@ -86,7 +85,6 @@ class drupal (
   $package_repository = undef,
   $package_branch = undef,
   $conf = undef,
-  $conf_cron_key = undef,
   $conf_markdown_directory = undef,
   $conf_ga_account = undef,
   $conf_openid_provider = undef,
@@ -272,7 +270,7 @@ class drupal (
 
   cron { $site_name:
     name    => "${site_name}.cron",
-    command => "wget -O /dev/null -q -t 1 ${$site_base_url}/cron.php?cron_key=${$conf_cron_key}",
+    command => "wget -O /dev/null -q -t 1 ${$site_base_url}/cron.php?cron_key=${$conf['cron_key']}",
     user    => root,
     minute  => '*/5',
     require => [