Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aes
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
liu-puppet-modules
aes
Commits
ad96de01
Commit
ad96de01
authored
1 year ago
by
Filip Strömbäck
Browse files
Options
Downloads
Patches
Plain Diff
Updated the keydb to use vcsrepo as well.
parent
06f322f1
No related branches found
No related tags found
2 merge requests
!50
Fix: Puppet Defining "data_provider": "hiera" in metadata.json is deprecated....
,
!40
Merge from devel. Commits related to RHEL9 upgrade and pdk cleanup.
Pipeline
#101951
passed
1 year ago
Stage: puppet
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
files/auth/on_update_keydb.sh
+0
-4
0 additions, 4 deletions
files/auth/on_update_keydb.sh
manifests/auth_keydb.pp
+11
-18
11 additions, 18 deletions
manifests/auth_keydb.pp
with
11 additions
and
22 deletions
files/auth/on_update_keydb.sh
deleted
100644 → 0
+
0
−
4
View file @
06f322f1
#!/bin/bash
systemctl restart aes_auth_keydb.service
systemctl restart aes_temp_userdb.service
This diff is collapsed.
Click to expand it.
manifests/auth_keydb.pp
+
11
−
18
View file @
ad96de01
# @summary
#
Describe what this class do!
#
Key database for the communication module.
#
# Detailed summary info if suitable
# Stores authentication keys (=SSH keys) for cases where Kerberos
# is not a suitable authentication method.
#
#
class
aes::auth_keydb
{
...
...
@@ -45,22 +46,14 @@ class aes::auth_keydb {
source
=>
"puppet:///modules/
${module_name}
/auth/keydb.service"
,
}
file
{
"
${keydb_home}
/on_update.sh"
:
ensure
=>
file
,
owner
=>
root
,
group
=>
root
,
mode
=>
'0700'
,
source
=>
"puppet:///modules/
${module_name}
/auth/on_update_keydb.sh"
,
}
exec
{
'update-keydb-repo'
:
command
=>
"/opt/utils/update_repo.sh
${keydb_home}
/src https://oauth2:F-agHaRXCdyFy38q4c-N@gitlab.liu.se/upp-aes/communication.git
${server_type}
"
,
environment
=>
[
"REPO_USER=
${keydb_user}
"
,
"REPO_GROUP=
${keydb_group}
"
,
"REPO_ON_UPDATE=
${keydb_home}
/on_update.sh"
],
# This command will need to run "on_update" as root in order to restart the service.
user
=>
root
,
group
=>
root
,
cwd
=>
$keydb_home
,
require
=>
File
[
"
${keydb_home}
/on_update.sh"
],
vcsrepo
{
"
${keydb_home}
/src"
:
ensure
=>
latest
,
provider
=>
git
,
source
=>
'https://oauth2:F-agHaRXCdyFy38q4c-N@gitlab.liu.se/upp-aes/communication.git'
,
revision
=>
$server_type
,
owner
=>
$keydb_user
,
group
=>
$keydb_group
,
notify
=>
[
Service
[
$keydb_service
],
Service
[
'aes_temp_userdb'
]],
}
service
{
$keydb_service
:
...
...
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