projects
/
cascardo
/
ipsilon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add proper ordering to login plugins config opts
[cascardo/ipsilon.git]
/
ipsilon
/
login
/
authform.py
diff --git
a/ipsilon/login/authform.py
b/ipsilon/login/authform.py
index
85b31bd
..
d372eff
100755
(executable)
--- a/
ipsilon/login/authform.py
+++ b/
ipsilon/login/authform.py
@@
-50,15
+50,11
@@
class LoginManager(LoginManagerBase):
self.name = 'form'
self.path = 'form'
self.page = None
self.name = 'form'
self.path = 'form'
self.page = None
+ self.service_name = 'form'
self.description = """
Form based login Manager. Relies on mod_intercept_form_submit plugin for
actual authentication. """
self._options = {
self.description = """
Form based login Manager. Relies on mod_intercept_form_submit plugin for
actual authentication. """
self._options = {
- 'service name': [
- """ The name of the PAM service used to authenticate. """,
- 'string',
- 'remote'
- ],
'help text': [
""" The text shown to guide the user at login time. """,
'string',
'help text': [
""" The text shown to guide the user at login time. """,
'string',
@@
-75,10
+71,7
@@
Form based login Manager. Relies on mod_intercept_form_submit plugin for
'Password'
],
}
'Password'
],
}
-
- @property
- def service_name(self):
- return self.get_config_value('service name')
+ self.conf_opt_order = ['username text', 'password text', 'help text']
@property
def help_text(self):
@property
def help_text(self):