Merge 19309dc into 2b5b77f

.about.yml

@@ -75,8 +75,8 @@ stack:
 #     url: URL for the text of the license
 licenses:
   authdelegate:
-    name: CC0
-    url: https://github.com/18F/authdelegate/blob/master/LICENSE.md
+    name: ISC
+    url: https://github.com/mbland/authdelegate/blob/master/LICENSE.md
 
 # Blogs or websites associated with project development
 #blog:
@@ -92,7 +92,7 @@ licenses:
 
 # Email addresses of points-of-contact
 contact:
-- url: mailto:michael.bland@acm.org
+- url: mailto:mbland@acm.org
   text: Mike Bland
-- url: https://github.com/18F/authdelegate/issues
-  text: 18F/authdelegate issues
+- url: https://github.com/mbland/authdelegate/issues
+  text: mbland/authdelegate issues

.travis.yml

@@ -1,6 +1,7 @@
 language: go
 go:
-- 1.4.3
+- 1.4.x
+- 1.9
 script:
 - go test ./...
 - go get -u github.com/axw/gocov/gocov

LICENSE.md

@@ -1,31 +1,13 @@
-As a work of the United States Government, this project is in the
-public domain within the United States.
-
-Additionally, we waive copyright and related rights in the work
-worldwide through the CC0 1.0 Universal public domain dedication.
-
-## CC0 1.0 Universal Summary
-
-This is a human-readable summary of the [Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode).
-
-### No Copyright
-
-The person who associated a work with this deed has dedicated the work to
-the public domain by waiving all of his or her rights to the work worldwide
-under copyright law, including all related and neighboring rights, to the
-extent allowed by law.
-
-You can copy, modify, distribute and perform the work, even for commercial
-purposes, all without asking permission.
-
-### Other Information
-
-In no way are the patent or trademark rights of any person affected by CC0,
-nor are the rights that other persons may have in the work or in how the
-work is used, such as publicity or privacy rights.
-
-Unless expressly stated otherwise, the person who associated a work with
-this deed makes no warranties about the work, and disclaims liability for
-all uses of the work, to the fullest extent permitted by applicable law.
-When using or citing the work, you should not imply endorsement by the
-author or the affirmer.
+Copyright (c) 2017 Mike Bland <mbland@acm.org>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.

README.md

@@ -1,8 +1,8 @@
 # authdelegate Authentication Delegate Server
 
-[![Build Status](https://travis-ci.org/18F/authdelegate.svg?branch=master)](https://travis-ci.org/18F/authdelegate)
+[![Build Status](https://travis-ci.org/mbland/authdelegate.svg?branch=master)](https://travis-ci.org/mbland/authdelegate)
 
-[![Coverage Status](https://coveralls.io/repos/18F/authdelegate/badge.svg?branch=master&service=github)](https://coveralls.io/github/18F/authdelegate?branch=master)
+[![Coverage Status](https://coveralls.io/repos/mbland/authdelegate/badge.svg?branch=master&service=github)](https://coveralls.io/github/mbland/authdelegate?branch=master)
 
 A server that routes authenticated requests to multiple authentication
 servers based on the presence of specific headers or cookies in a request.
@@ -16,7 +16,7 @@ and its `auth_request` directive.
 Imagine a static site served by nginx that contains API endpoints that should
 be authenticated both via [bitly/oauth2_proxy](https://github.com/bitly/oauth2_proxy)
 (so normal users can see the JSON in a browser) and via
-[18F/hmacproxy](https://github.com/18F/hmacproxy/) (so that programs can
+[mbland/hmacproxy](https://github.com/mbland/hmacproxy/) (so that programs can
 access the endpoints via HMAC-authenticated requests). This program allows you
 to forward requests to both servers depending on whether any incoming request
 has either an Oauth2 cookie or a header containing an HMAC signature.
@@ -30,7 +30,7 @@ generally.
 For now, install from source:
 
 ```sh
-$ go get github.com/18F/authdelegate
+$ go get github.com/mbland/authdelegate
 ```
 
 ## Configuration and execution
@@ -129,13 +129,3 @@ server {
 If you wish to expose the delegate directly to the public, rather than via an
 Nginx proxy scheme, pass the `-ssl-cert` and `-ssl-key` options along all
 other `-auth` parameters.
-
-## Public domain
-
-This project is in the worldwide [public domain](LICENSE.md). As stated in [CONTRIBUTING](CONTRIBUTING.md):
-
-> This project is in the public domain within the United States, and copyright and related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
->
-> All contributions to this project will be released under the CC0
->dedication. By submitting a pull request, you are agreeing to comply
->with this waiver of copyright interest.

main_test.go

@@ -8,5 +8,5 @@ import (
 
 func TestOptions(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "18F/authdelegate Suite")
+	RunSpecs(t, "mbland/authdelegate Suite")
 }