From owner-svn-src-user@freebsd.org Sun May 6 11:21:33 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4ADCFFB6BD6 for ; Sun, 6 May 2018 11:21:33 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F190A7B75C; Sun, 6 May 2018 11:21:32 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D323641F6; Sun, 6 May 2018 11:21:32 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46BLWKa005222; Sun, 6 May 2018 11:21:32 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46BLWdB005220; Sun, 6 May 2018 11:21:32 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805061121.w46BLWdB005220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 6 May 2018 11:21:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333292 - user/des/fbce/db X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: user/des/fbce/db X-SVN-Commit-Revision: 333292 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 11:21:33 -0000 Author: des Date: Sun May 6 11:21:32 2018 New Revision: 333292 URL: https://svnweb.freebsd.org/changeset/base/333292 Log: Add gjb@'s LDAP-snarfing scripts. Added: user/des/fbce/db/genuserlist.pl (contents, props changed) user/des/fbce/db/genuserlist.sh (contents, props changed) Added: user/des/fbce/db/genuserlist.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/fbce/db/genuserlist.pl Sun May 6 11:21:32 2018 (r333292) @@ -0,0 +1,72 @@ +#!/usr/bin/env perl +# +# $Id$ +# + +my $file = "$ARGV[0]"; +my $haveuid = 0; +my $havekey = 0; +my $uid = ''; + +sub usage() { + print "Usage: $ARGV[0] /path/to/ldap/data\n"; + exit (1); +} + +sub main() { + if (!$ARGV[0]) { + &usage(); + } + open(FILE, $file) or die("Could not open $file\n"); + while() { + chomp($_); + + # Skip commented lines. + if ($_ =~ m/^#/) { + next; + } + + # Skip empty lines, reset vars. + if ($_ =~ m/^$/) { + $haveuid = 0; + $uid = ''; + $havekey = 0; + next; + } + + # Found the uid field. Make sure it is not empty, then set + # haveuid=1. + if ($_ =~ m/^uid: /) { + $_ =~ s/^uid: //; + # The one unfortunate account *with* an ssh key. + if ($_ =~ m/backup/) { + next; + } + $uid = $_; + $haveuid = 1; + } + + # No need to search for a key if haveuid=0. + if ($haveuid eq 1) { + # Have the key. + if ($_ =~ m/^sshPublicKey::? /) { + $_ =~ s/^sshPublicKey::? //; + # It should not happen, but if a key datafield exists + # without a key, bail. + if ($_ =~ m//) { + $haveuid = 0; + next; + } + # Great. We have found a key for the UID. Since they + # have login access, they can vote. Good for them. + $havekey = 1; + print "$uid\n"; + $haveuid = 0; + } + } + } + close(FILE); +} + +&main(); + Added: user/des/fbce/db/genuserlist.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/fbce/db/genuserlist.sh Sun May 6 11:21:32 2018 (r333292) @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +users= +tmpfile="$(mktemp $HOME/tmp.XXXXXXXXXX)" + +main() { + cd $(realpath $(dirname $(basename ${0}))) + userlist="$(ldapsearch -x -b \ + ou=users,dc=freebsd,dc=org \ + -s children \ + '(&(objectClass=freebsdAccount)(cn=*)(uid=*)(sshPublicKey=*)(loginShell=*)(!(loginShell=/usr/sbin/nologin))(!(uid=*test))(!(uid=socsvn-import)))' \ + uid uidNumber loginShell sshPublicKey)" + printf "${userlist}" > ${tmpfile} + echo "Output written to: ${tmpfile}" + + ./genuserlist.pl ${tmpfile} > ./users.txt + + echo "Final output written to: users.txt" + +} + +main "$@" From owner-svn-src-user@freebsd.org Sun May 6 11:47:54 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11892FB7237 for ; Sun, 6 May 2018 11:47:54 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B787580ED2; Sun, 6 May 2018 11:47:53 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE145456D; Sun, 6 May 2018 11:47:53 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46Blrec015894; Sun, 6 May 2018 11:47:53 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46Blr2L015893; Sun, 6 May 2018 11:47:53 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805061147.w46Blr2L015893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 6 May 2018 11:47:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333293 - user/des/fbce/lib/FBCE/Schema/Result X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: user/des/fbce/lib/FBCE/Schema/Result X-SVN-Commit-Revision: 333293 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 11:47:54 -0000 Author: des Date: Sun May 6 11:47:53 2018 New Revision: 333293 URL: https://svnweb.freebsd.org/changeset/base/333293 Log: Add a reset_password() method which resets the user's password to '*'. Modified: user/des/fbce/lib/FBCE/Schema/Result/Person.pm Modified: user/des/fbce/lib/FBCE/Schema/Result/Person.pm ============================================================================== --- user/des/fbce/lib/FBCE/Schema/Result/Person.pm Sun May 6 11:21:32 2018 (r333292) +++ user/des/fbce/lib/FBCE/Schema/Result/Person.pm Sun May 6 11:47:53 2018 (r333293) @@ -241,6 +241,17 @@ sub check_password($$) { } # +# Reset the password. +# +sub reset_password($) { + my ($self) = @_; + + $self->set_column(password => '*'); + $self->update() + if $self->in_storage(); +} + +# # Pretty name # sub name($) { From owner-svn-src-user@freebsd.org Sun May 6 11:51:12 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93496FB749B for ; Sun, 6 May 2018 11:51:12 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 456CA8113E; Sun, 6 May 2018 11:51:12 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 405B6459F; Sun, 6 May 2018 11:51:12 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46BpCWW016847; Sun, 6 May 2018 11:51:12 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46BpC20016846; Sun, 6 May 2018 11:51:12 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805061151.w46BpC20016846@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 6 May 2018 11:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333294 - user/des/fbce/db X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: user/des/fbce/db X-SVN-Commit-Revision: 333294 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 11:51:12 -0000 Author: des Date: Sun May 6 11:51:11 2018 New Revision: 333294 URL: https://svnweb.freebsd.org/changeset/base/333294 Log: Various updates and improvements. Modified: user/des/fbce/db/notes Modified: user/des/fbce/db/notes ============================================================================== --- user/des/fbce/db/notes Sun May 6 11:47:53 2018 (r333293) +++ user/des/fbce/db/notes Sun May 6 11:51:11 2018 (r333294) @@ -34,13 +34,16 @@ psql -f db/fbce.sql fbce fbce # One-liner to set a user's password perl -Ilib -MFBCE -e 'FBCE->model("FBCE::Person")->find({ login => "kenneth36" })->set_password("4ltInn!?")' +# One-liner to reset everybody's passwords +perl -Ilib -MFBCE -e 'map { $_->reset_password() } FBCE->model("FBCE::Person")->all();' + # # The list of users is generated on freefall using scripts written for # that purpose by gjb: # -# des@freefall ~% ~gjb/bin/genuserlist.sh -# des@freefall ~% sort users.txt >users-20180516.txt -# des@freefall ~% getent passwd >gecos-20180516.txt +# % ./genuserlist.sh +# % sort users.txt >users-20180516.txt +# % getent passwd | sort >gecos-20180516.txt # ./script/fbce_user.pl import users-20180516.txt ./script/fbce_user.pl gecos gecos-20180516.txt @@ -56,7 +59,7 @@ perl -Ilib -MFBCE -e 'FBCE->model("FBCE::Person")->fin # fst3k=# \t on # Showing only tuples. # fst3k=# \o active-20180516.txt -# fst3k=# select p.login from persons p join revisions r on p.id = r.author where r.datetime >= '2017-05-16' group by p.login; +# fst3k=# select p.login from persons p join revisions r on p.id = r.author where r.datetime >= '2017-05-16' group by p.login order by p.login; # fst3k=# \o # ./script/fbce_user.pl activate active-20180516.txt @@ -72,6 +75,11 @@ perl -Ilib -MFBCE -e 'FBCE->model("FBCE::Person")->fin # Finally, generate passwords # ./script/fbce_user.pl pwgen + +# +# The resulting fbce-passwords.tgz can now be sent to clusteradm who +# will untar it in /home on freefall. +# # Print the logins of active users who haven't voted perl -Ilib -MFBCE -e 'map { print $_->login, "\n" } grep { $_->active && $_->votes_voters->count == 0 } FBCE->model("FBCE::Person")->all' From owner-svn-src-user@freebsd.org Sun May 6 11:58:02 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F555FB760D for ; Sun, 6 May 2018 11:58:02 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B2EC3828CA; Sun, 6 May 2018 11:58:01 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4A4D46FC; Sun, 6 May 2018 11:58:01 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46Bw1ac021325; Sun, 6 May 2018 11:58:01 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46Bw1PX021324; Sun, 6 May 2018 11:58:01 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805061158.w46Bw1PX021324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 6 May 2018 11:58:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333295 - user/des/fbce X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: user/des/fbce X-SVN-Commit-Revision: 333295 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 11:58:02 -0000 Author: des Date: Sun May 6 11:58:01 2018 New Revision: 333295 URL: https://svnweb.freebsd.org/changeset/base/333295 Log: Add a missing dependency and sort. Modified: user/des/fbce/README Modified: user/des/fbce/README ============================================================================== --- user/des/fbce/README Sun May 6 11:51:11 2018 (r333294) +++ user/des/fbce/README Sun May 6 11:58:01 2018 (r333295) @@ -6,16 +6,17 @@ DBIx::Class ORM. You will need to install the following packages to run FBCE: pkg install \ - p5-Catalyst-Runtime \ + p5-Catalyst-Action-RenderView \ + p5-Catalyst-Authentication-Store-DBIx-Class \ p5-Catalyst-Model-DBIC-Schema \ + p5-Catalyst-Plugin-Authentication \ p5-Catalyst-Plugin-ConfigLoader \ p5-Catalyst-Plugin-DateTime \ - p5-Catalyst-Plugin-Authentication \ - p5-Catalyst-Authentication-Store-DBIx-Class \ p5-Catalyst-Plugin-Session \ p5-Catalyst-Plugin-Session-State-Cookie \ p5-Catalyst-Plugin-Session-Store-FastMmap \ p5-Catalyst-Plugin-Static-Simple \ + p5-Catalyst-Runtime \ p5-Catalyst-View-TT \ p5-Crypt-SaltedHash \ p5-FCGI-Engine \ From owner-svn-src-user@freebsd.org Sun May 6 13:31:50 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83972FBA2C4 for ; Sun, 6 May 2018 13:31:50 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 37AF5757A5; Sun, 6 May 2018 13:31:50 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 32B3556BD; Sun, 6 May 2018 13:31:50 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46DVnC6072509; Sun, 6 May 2018 13:31:49 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46DVnFY072508; Sun, 6 May 2018 13:31:49 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805061331.w46DVnFY072508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 6 May 2018 13:31:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333301 - user/des/fbce X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: user/des/fbce X-SVN-Commit-Revision: 333301 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 13:31:50 -0000 Author: des Date: Sun May 6 13:31:49 2018 New Revision: 333301 URL: https://svnweb.freebsd.org/changeset/base/333301 Log: Set the secure cookie flag. Modified: user/des/fbce/fbce.conf Modified: user/des/fbce/fbce.conf ============================================================================== --- user/des/fbce/fbce.conf Sun May 6 13:21:44 2018 (r333300) +++ user/des/fbce/fbce.conf Sun May 6 13:31:49 2018 (r333301) @@ -28,7 +28,7 @@ descr = 2018 FreeBSD core team election expires = 7200 cookie_expires = 0 - # cookie_secure = true + cookie_secure = 1 storage = /tmp/fbce.__UID__/session-cache unlink_on_exit = 0 cache_size = 8m From owner-svn-src-user@freebsd.org Sun May 6 13:32:05 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29426FBA33B for ; Sun, 6 May 2018 13:32:05 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CAB03758D0; Sun, 6 May 2018 13:32:04 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5A8A56CF; Sun, 6 May 2018 13:32:04 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46DW47j073346; Sun, 6 May 2018 13:32:04 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46DW4RD073345; Sun, 6 May 2018 13:32:04 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805061332.w46DW4RD073345@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 6 May 2018 13:32:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333302 - user/des/fbce/misc X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: user/des/fbce/misc X-SVN-Commit-Revision: 333302 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 13:32:05 -0000 Author: des Date: Sun May 6 13:32:04 2018 New Revision: 333302 URL: https://svnweb.freebsd.org/changeset/base/333302 Log: Update the Apache configuration example. Modified: user/des/fbce/misc/apache.conf Modified: user/des/fbce/misc/apache.conf ============================================================================== --- user/des/fbce/misc/apache.conf Sun May 6 13:31:49 2018 (r333301) +++ user/des/fbce/misc/apache.conf Sun May 6 13:32:04 2018 (r333302) @@ -4,13 +4,13 @@ FastCgiServer /home/des/fbce/script/fbce_fastcgi.pl -processes 3 -Alias /2014/static /home/des/fbce/root/static -Alias /2014/ /home/des/fbce/script/fbce_fastcgi.pl/ +Alias /2018/static /home/des/fbce/root/static +Alias /2018/ /home/des/fbce/script/fbce_fastcgi.pl/ RewriteEngine on -RewriteRule ^/2014$ /2014/ [R] +RewriteRule ^/2018$ /2018/ [R] - + Order allow,deny Allow from all From owner-svn-src-user@freebsd.org Sun May 6 13:59:57 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D758FBAAC5 for ; Sun, 6 May 2018 13:59:57 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ECB07D1FF; Sun, 6 May 2018 13:59:57 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 452075A36; Sun, 6 May 2018 13:59:57 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46DxvXB083897; Sun, 6 May 2018 13:59:57 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46Dxv8u083896; Sun, 6 May 2018 13:59:57 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805061359.w46Dxv8u083896@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sun, 6 May 2018 13:59:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333303 - user/des/fbce/misc X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: user/des/fbce/misc X-SVN-Commit-Revision: 333303 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 13:59:57 -0000 Author: des Date: Sun May 6 13:59:56 2018 New Revision: 333303 URL: https://svnweb.freebsd.org/changeset/base/333303 Log: Update for Apache 2.4. Modified: user/des/fbce/misc/apache.conf Modified: user/des/fbce/misc/apache.conf ============================================================================== --- user/des/fbce/misc/apache.conf Sun May 6 13:32:04 2018 (r333302) +++ user/des/fbce/misc/apache.conf Sun May 6 13:59:56 2018 (r333303) @@ -1,5 +1,5 @@ - LoadModule fastcgi_module libexec/apache22/mod_fastcgi.so + LoadModule fastcgi_module libexec/apache24/mod_fastcgi.so FastCgiServer /home/des/fbce/script/fbce_fastcgi.pl -processes 3 @@ -11,6 +11,5 @@ RewriteEngine on RewriteRule ^/2018$ /2018/ [R] - Order allow,deny - Allow from all + Require all granted From owner-svn-src-user@freebsd.org Thu May 10 18:53:40 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA607FD3550 for ; Thu, 10 May 2018 18:53:40 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7005181332; Thu, 10 May 2018 18:53:40 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BB0524617; Thu, 10 May 2018 18:53:40 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4AIrebQ058963; Thu, 10 May 2018 18:53:40 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4AIrdt5058961; Thu, 10 May 2018 18:53:39 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805101853.w4AIrdt5058961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Thu, 10 May 2018 18:53:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333468 - in user/des/fbce: lib/FBCE/Controller root/lib X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: in user/des/fbce: lib/FBCE/Controller root/lib X-SVN-Commit-Revision: 333468 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 May 2018 18:53:41 -0000 Author: des Date: Thu May 10 18:53:39 2018 New Revision: 333468 URL: https://svnweb.freebsd.org/changeset/base/333468 Log: Use the configured description instead of a hardcoded one. Reported by: sevan@ Modified: user/des/fbce/lib/FBCE/Controller/Root.pm user/des/fbce/root/lib/help Modified: user/des/fbce/lib/FBCE/Controller/Root.pm ============================================================================== --- user/des/fbce/lib/FBCE/Controller/Root.pm Thu May 10 17:57:46 2018 (r333467) +++ user/des/fbce/lib/FBCE/Controller/Root.pm Thu May 10 18:53:39 2018 (r333468) @@ -31,6 +31,7 @@ sub auto :Private { # Stash schedule information etc. $c->stash(title => $c->config->{'title'}); + $c->stash(descr => $c->config->{'descr'}); my $now = DateTime->now(); $c->stash(now => $now); my $schedule = $c->model('Schedule'); Modified: user/des/fbce/root/lib/help ============================================================================== --- user/des/fbce/root/lib/help Thu May 10 17:57:46 2018 (r333467) +++ user/des/fbce/root/lib/help Thu May 10 18:53:39 2018 (r333468) @@ -1,7 +1,7 @@ [%-# $FreeBSD$ -%]

What is this?

-

This is the website for the 2016 FreeBSD core team elections. See the bylaws and the schedule posted on the front page for additional information on the election rules.

+

This is the website for the [% descr | html %]. See the bylaws and the schedule posted on the front page for additional information on the election rules.

Who has access?