diff options
| -rwxr-xr-x | files/drupal | 8 | ||||
| -rw-r--r-- | manifests/autoupgrade.pp | 30 |
2 files changed, 22 insertions, 16 deletions
diff --git a/files/drupal b/files/drupal index 644b776..d51fd10 100755 --- a/files/drupal +++ b/files/drupal @@ -38,7 +38,9 @@ function drupal_get_major { # Check for existing installations function drupal_check_existing { if [ -e "$BASE/drupal-$1" ]; then - echo "Folder $BASE/drupal-$1 already exists, skipping" + if [ "$SILENT" != "yes" ]; then + echo "Folder $BASE/drupal-$1 already exists, skipping" + fi exit fi } @@ -46,7 +48,9 @@ function drupal_check_existing { # Check for non existing installations function drupal_check_not_existing { if [ ! -e "$BASE/drupal-$1" ]; then - echo "Folder $BASE/drupal-$1 does not exist, skipping" + if [ "$SILENT" != "yes" ]; then + echo "Folder $BASE/drupal-$1 does not exist, skipping" + fi exit 1 fi } diff --git a/manifests/autoupgrade.pp b/manifests/autoupgrade.pp index 2bd5c1f..6aa881b 100644 --- a/manifests/autoupgrade.pp +++ b/manifests/autoupgrade.pp @@ -1,25 +1,27 @@ class drupal::autoupgrade { # Keep 8.x codebase updated cron { "drupal-autoupgrade-8.x": - command => "/usr/local/bin/drupal upgrade 8", - user => root, + command => "/usr/local/bin/drupal upgrade 8", + user => root, # Run once a week after security releases (usually on Wednesdays) - weekday => 5, - hour => "01", - minute => "30", - ensure => present, - require => [ File['/usr/local/bin/drupal'], User['drupal'] ], + weekday => 5, + hour => "01", + minute => "30", + environment => [ 'SILENT=yes' ], + ensure => present, + require => [ File['/usr/local/bin/drupal'], User['drupal'] ], } # Keep 7.x codebase updated cron { "drupal-autoupgrade-7.x": - command => "/usr/local/bin/drupal upgrade 7", - user => root, + command => "/usr/local/bin/drupal upgrade 7", + user => root, # Run once a week after security releases (usually on Wednesdays) - weekday => 5, - hour => "01", - minute => "30", - ensure => present, - require => [ File['/usr/local/bin/drupal'], User['drupal'] ], + weekday => 5, + hour => "01", + minute => "30", + environment => [ 'SILENT=yes' ], + ensure => present, + require => [ File['/usr/local/bin/drupal'], User['drupal'] ], } } |