From 8f6cfbfade6018732495addce11f6d5e93e0b723 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:33:27 -0400
Subject: [PATCH] Removed the openidsignup option.
---
IkiWiki/Plugin/openid.pm | 15 ---------------
debian/changelog | 1 +
doc/plugins/openid.mdwn | 12 ------------
3 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 7e4d0844a..36002371a 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -9,7 +9,6 @@ use IkiWiki 3.00;
sub import {
add_underlay("openid-selector");
hook(type => "checkconfig", id => "openid", call => \&checkconfig);
- hook(type => "getopt", id => "openid", call => \&getopt);
hook(type => "getsetup", id => "openid", call => \&getsetup);
hook(type => "auth", id => "openid", call => \&auth);
hook(type => "formbuilder_setup", id => "openid",
@@ -34,13 +33,6 @@ sub checkconfig () {
}
}
-sub getopt () {
- eval q{use Getopt::Long};
- error($@) if $@;
- Getopt::Long::Configure('pass_through');
- GetOptions("openidsignup=s" => \$config{openidsignup});
-}
-
sub getsetup () {
return
plugin => {
@@ -48,13 +40,6 @@ sub getsetup () {
rebuild => 0,
section => "auth",
},
- openidsignup => {
- type => "string",
- example => "http://myopenid.com/",
- description => "an url where users can signup for an OpenID",
- safe => 1,
- rebuild => 0,
- },
}
sub openid_selector {
diff --git a/debian/changelog b/debian/changelog
index 3f20aec1a..595b8a2b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
(http://code.google.com/p/openid-selector/)
* openid: Use "openid_identifier" as the form field, as required
by OpenID Authentication v2.0 spec.
+ * Removed the openidsignup option.
-- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 18:07:29 -0400
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index cd05bb1ad..7da2f8575 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -11,17 +11,5 @@ The [[!cpan LWPx::ParanoidAgent]] perl module is used if available, for
added security. Finally, the [[!cpan Crypt::SSLeay]] perl module is needed
to support users entering "https" OpenID urls.
-This plugin has a configuration option. You can set `--openidsignup`
-to the url of a third-party site where users can sign up for an OpenID. If
-it's set, the signin page will link to that site.
-
-This plugin supports the
-[myopenid.com affiliate program](http://myopenid.com/affiliate),
-which can be used to help users sign up for an OpenID and log into your
-site in a single, unified process. When you create the affiliate, specify a
-login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the
-affiliate is created, set `openidsignup` to point to the affiliate's signup
-url.
-
This plugin is enabled by default, but can be turned off if you want to
only use some other form of authentication, such as [[passwordauth]].
--
2.39.5