Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
puppet-ssp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Adullact
puppet-ssp
Commits
5334e677
Commit
5334e677
authored
5 years ago
by
Fabien Combernous
Browse files
Options
Downloads
Plain Diff
Merge branch '16-add-parameter-default_action-and-use_change' into 'master'
Resolve "add parameter use_change" Closes
#16
See merge request
!16
parents
d0fd3d14
b581e297
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!16
Resolve "add parameter use_change"
Pipeline
#6736
canceled
5 years ago
Stage: syntax
Stage: unit
Stage: acceptance
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
REFERENCE.md
+8
-0
8 additions, 0 deletions
REFERENCE.md
manifests/init.pp
+13
-0
13 additions, 0 deletions
manifests/init.pp
templates/config.inc.local.php.epp
+4
-0
4 additions, 0 deletions
templates/config.inc.local.php.epp
with
25 additions
and
0 deletions
REFERENCE.md
+
8
−
0
View file @
5334e677
...
@@ -223,6 +223,14 @@ Default action displayed by the webui
...
@@ -223,6 +223,14 @@ Default action displayed by the webui
Default value: 'change'
Default value: 'change'
##### `use_change`
Data type:
`Boolean`
enable (with true) or disable (with false) standard change form usage.
Default value:
`true`
##### `use_tokens`
##### `use_tokens`
Data type:
`Boolean`
Data type:
`Boolean`
...
...
This diff is collapsed.
Click to expand it.
manifests/init.pp
+
13
−
0
View file @
5334e677
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
# Hide some messages to not disclose sensitive information.
# Hide some messages to not disclose sensitive information.
# These messages will be replaced by value of obscure_failure_messages.
# These messages will be replaced by value of obscure_failure_messages.
# @param default_action Default action displayed by the webui
# @param default_action Default action displayed by the webui
# @param use_change enable (with true) or disable (with false) standard change form usage.
# @param use_tokens enable (with true) or disable (with false) tokens usage.
# @param use_tokens enable (with true) or disable (with false) tokens usage.
# @param crypt_tokens crypt tokens (with true) or no (with false)
# @param crypt_tokens crypt tokens (with true) or no (with false)
# @param token_lifetime When token are used, the token lifetime.
# @param token_lifetime When token are used, the token lifetime.
...
@@ -102,6 +103,7 @@ class ssp (
...
@@ -102,6 +103,7 @@ class ssp (
Optional
[
String
[
1
]]
$login_forbidden_chars
=
undef
,
Optional
[
String
[
1
]]
$login_forbidden_chars
=
undef
,
Optional
[
String
[
1
]]
$obscure_failure_messages
=
undef
,
Optional
[
String
[
1
]]
$obscure_failure_messages
=
undef
,
Enum
[
'change'
,
'sendtoken'
]
$default_action
=
'change'
,
Enum
[
'change'
,
'sendtoken'
]
$default_action
=
'change'
,
Boolean
$use_change
=
true
,
Boolean
$use_tokens
=
true
,
Boolean
$use_tokens
=
true
,
Boolean
$crypt_tokens
=
true
,
Boolean
$crypt_tokens
=
true
,
Integer
$token_lifetime
=
3600
,
Integer
$token_lifetime
=
3600
,
...
@@ -141,6 +143,17 @@ class ssp (
...
@@ -141,6 +143,17 @@ class ssp (
$_keynumber
=
fqdn_rand
(
50
,
'tocken_seed'
)
$_keynumber
=
fqdn_rand
(
50
,
'tocken_seed'
)
$_keyphrase
=
"
$
{facts['hostname']}
${_keynumber}
"
$_keyphrase
=
"
$
{facts['hostname']}
${_keynumber}
"
$_ldap_urls
=
join
(
$ldap_url
,
' '
)
$_ldap_urls
=
join
(
$ldap_url
,
' '
)
# define the default action to unused one is not possible
if
!
$use_change
and
$default_action
==
'change'
{
fail
(
'$use_change is set to false and $default_action is set to "change"'
)
}
if
!
$use_tokens
and
$default_action
==
'sendtoken'
{
fail
(
'$use_tokens is set to false and $default_action is set to "sendtoken"'
)
}
# The two others actions available with SSP are not handled by this Puppet module.
# They are hard coded to false, and not proposed in Enum data type for $default_action
$_use_sms
=
false
$_use_sms
=
false
$_use_questions
=
false
$_use_questions
=
false
...
...
This diff is collapsed.
Click to expand it.
templates/config.inc.local.php.epp
+
4
−
0
View file @
5334e677
...
@@ -52,6 +52,10 @@ $pwd_show_policy_pos = "<%= $ssp::pwd_show_policy_pos %>";
...
@@ -52,6 +52,10 @@ $pwd_show_policy_pos = "<%= $ssp::pwd_show_policy_pos %>";
# disallow use of the only special character as defined in `$pwd_special_chars` at the beginning and end
# disallow use of the only special character as defined in `$pwd_special_chars` at the beginning and end
$pwd_no_special_at_ends =
<%=
$ssp::pwd_no_special_at_ends
%>
;
$pwd_no_special_at_ends =
<%=
$ssp::pwd_no_special_at_ends
%>
;
## Standard change
# Use standard change form?
$use_change =
<%=
$ssp::use_change
%>
;
# Who changes the password?
# Who changes the password?
# Also applicable for question/answer save
# Also applicable for question/answer save
# user: the user itself
# user: the user itself
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment