opendev/puppet-drupal
Code Issues Proposed changes

Get cron key variable from conf parameter

Browse Source 
Remove the deprecated conf_cron_key from cron resource.

Change-Id: Ie65b88786b9cbd61b1af9657052ce57c9aaa1fd1
This commit is contained in:
Marton Kiss
2015-02-26 12:54:56 +01:00
parent 0d8c23c4f7
commit 95857ebcf5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@@ -50,7 +50,6 @@
# #
# Drupal configuration variables: # Drupal configuration variables:
# - conf: contains the key-value pairs of settings.php # - conf: contains the key-value pairs of settings.php
# - conf_cron_key: cron_key setting used for cron access
# #
# Remarks: # Remarks:
# - the site lives in /srv/vhosts/{hostname}/slot0 or slot1 directory # - the site lives in /srv/vhosts/{hostname}/slot0 or slot1 directory
@@ -86,7 +85,6 @@ class drupal (
$package_repository = undef, $package_repository = undef,
$package_branch = undef, $package_branch = undef,
$conf = undef, $conf = undef,
$conf_cron_key = undef,
$conf_markdown_directory = undef, $conf_markdown_directory = undef,
$conf_ga_account = undef, $conf_ga_account = undef,
$conf_openid_provider = undef, $conf_openid_provider = undef,
@@ -272,7 +270,7 @@ class drupal (
cron { $site_name: cron { $site_name:
name => "${site_name}.cron", 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, user => root,
minute => '*/5', minute => '*/5',
require => [ require => [