svn commit: r360389 - in user/des/fbce: . misc

[Allan Jude]

Author: allanjude
Date: Mon Apr 27 18:07:38 2020
New Revision: 360389
URL: https://svnweb.freebsd.org/changeset/base/360389

Log:
  Update for 2020

Modified:
  user/des/fbce/fbce.conf
  user/des/fbce/misc/apache.conf

Modified: user/des/fbce/fbce.conf
==============================================================================
--- user/des/fbce/fbce.conf	Mon Apr 27 18:04:42 2020	(r360388)
+++ user/des/fbce/fbce.conf	Mon Apr 27 18:07:38 2020	(r360389)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-title = 2018 FreeBSD Core Team Election
-descr = 2018 FreeBSD core team election
+title = 2020 FreeBSD Core Team Election
+descr = 2020 FreeBSD core team election
 
 <Model::FBCE>
   <connect_info>
@@ -12,12 +12,12 @@ descr = 2018 FreeBSD core team election
 </Model::FBCE>
 
 <Model::Schedule>
-  nominating_starts = 2018-05-16 18:00:00 UTC
-  nominating_ends = 2018-05-23 18:00:00 UTC
-  voting_starts = 2018-05-23 18:00:00 UTC
-  voting_ends = 2018-06-20 18:00:00 UTC
-  announcement = 2018-06-27 18:00:00 UTC
-  investiture = 2018-07-04 18:00:00 UTC
+  nominating_starts = 2020-05-13 18:00:00 UTC
+  nominating_ends = 2020-05-20 18:00:00 UTC
+  voting_starts = 2020-05-20 18:00:00 UTC
+  voting_ends = 2020-06-17 18:00:00 UTC
+  announcement = 2020-06-24 18:00:00 UTC
+  investiture = 2020-07-01 18:00:00 UTC
 </Model::Schedule>
 
 <Model::Rules>

Modified: user/des/fbce/misc/apache.conf
==============================================================================
--- user/des/fbce/misc/apache.conf	Mon Apr 27 18:04:42 2020	(r360388)
+++ user/des/fbce/misc/apache.conf	Mon Apr 27 18:07:38 2020	(r360389)
@@ -4,12 +4,12 @@
 
 FastCgiServer /home/des/fbce/script/fbce_fastcgi.pl -processes 3
 
-Alias /2018/static /home/des/fbce/root/static
-Alias /2018/ /home/des/fbce/script/fbce_fastcgi.pl/
+Alias /2020/static /home/des/fbce/root/static
+Alias /2020/ /home/des/fbce/script/fbce_fastcgi.pl/
 
 RewriteEngine on
-RewriteRule ^/2018$ /2018/ [R]
+RewriteRule ^/2020$ /2020/ [R]
 
-<Location /2018>
+<Location /2020>
   Require all granted
 </Location>