Filippo Giunchedi has submitted this change and it was merged.
Change subject: wikimania_scholarships: don't manage open/close dates
......................................................................
wikimania_scholarships: don't manage open/close dates
open/close dates are now controlled in the database
Bug: T92358
Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
---
M manifests/role/wikimania_scholarships.pp
M modules/wikimania_scholarships/manifests/init.pp
M modules/wikimania_scholarships/templates/env.erb
3 files changed, 0 insertions(+), 26 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Filippo Giunchedi: Verified; Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
diff --git a/manifests/role/wikimania_scholarships.pp
b/manifests/role/wikimania_scholarships.pp
index 4139a68..7a55526 100644
--- a/manifests/role/wikimania_scholarships.pp
+++ b/manifests/role/wikimania_scholarships.pp
@@ -5,10 +5,6 @@
class role::wikimania_scholarships {
class { '::wikimania_scholarships':
- # Opening date for 2014 application cycle
- open_date => '2014-01-06T00:00:00Z',
- # Closing date for 2014 application cycle
- close_date => '2014-02-17T23:59:59Z',
hostname => 'scholarships.wikimedia.org',
deploy_dir => '/srv/deployment/scholarships/scholarships',
cache_dir => '/var/cache/scholarships',
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index df231f0..183cdd9 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -4,8 +4,6 @@
# application.
#
# == Parameters:
-# - $open_date: date/time that applications will first be accepted
-# - $close_date: date/time after which applications will no longer be accepted
# - $hostname: hostname for apache vhost
# - $deploy_dir: directory application is deployed to
# - $cache_dir: directory for caching twig templates
@@ -18,13 +16,9 @@
# == Sample usage:
#
# class { 'wikimania_scholarships':
-# open_date => '2014-01-01T00:00:00Z',
-# close_date => '2014-02-28T23:59:59Z'
# }
#
class wikimania_scholarships(
- $open_date = 'UNSET',
- $close_date = 'UNSET',
$hostname = 'scholarships.wikimedia.org',
$deploy_dir = '/srv/deployment/scholarships/scholarships',
$cache_dir = '/var/cache/scholarships',
@@ -43,14 +37,6 @@
$mysql_user = $passwords::mysql::wikimania_scholarships::app_user
$mysql_pass = $passwords::mysql::wikimania_scholarships::app_password
$log_file = "udp://${udp2log_dest}/scholarships"
-
- # Check arguments
- if $open_date == 'UNSET' {
- fail('$open_date must be a date parsable by PHP\'s strtotime()')
- }
- if $close_date == 'UNSET' {
- fail('$close_date must be a date parsable by PHP\'s strtotime()')
- }
system::role { 'wikimania_scholarships':
description => 'Wikimania Scholarships server'
diff --git a/modules/wikimania_scholarships/templates/env.erb
b/modules/wikimania_scholarships/templates/env.erb
index 2784acc..24c31cc 100644
--- a/modules/wikimania_scholarships/templates/env.erb
+++ b/modules/wikimania_scholarships/templates/env.erb
@@ -20,11 +20,3 @@
; Directory for apache to write twig template cache files
CACHE_DIR=<%= @cache_dir %>
-
-; Date/time that applications will first be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_OPEN=<%= @open_date %>
-
-; Date/time after which applications will no longer be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_CLOSE=<%= @close_date %>
--
To view, visit https://gerrit.wikimedia.org/r/201143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
