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
dfd15ce6
Commit
dfd15ce6
authored
4 years ago
by
Filip Strömbäck
Browse files
Options
Downloads
Patches
Plain Diff
Added AD keys. Experiment to see if Hiera storage works.
parent
33159ad9
No related branches found
Branches containing commit
No related tags found
2 merge requests
!7
Merge of PDK, broker, auth
,
!4
Devel
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
data/common.yaml
+27
-0
27 additions, 0 deletions
data/common.yaml
manifests/auth.pp
+27
-1
27 additions, 1 deletion
manifests/auth.pp
with
54 additions
and
1 deletion
data/common.yaml
0 → 100644
+
27
−
0
View file @
dfd15ce6
version
:
5
aes::auth::keytab_production
:
>
ENC[PKCS7,MIIBygYJKoZIhvcNAQcDoIIBuzCCAbcCAQAxggEhMIIBHQIBADAFMAACAQEw
DQYJKoZIhvcNAQEBBQAEggEAfFSsoD6ALGcGIKtmxr/5DxCxmDUSAf2M/7dg
krxqYfSLDUZ2z4hWCqWotA2urirssyEuf2kKnX2DpVxPN/N8Nzzt6IKwgk2Y
EL4EbjOGdbUtH6vQmq4gcbQEs5WRiVDWYeFBvq4+OlLqbnOuaQu4opLzz6R3
Syqx7+y3f8E+CaBHHB+6FN+P2LMPlqQQo7eiUSWFFuarJIDm1058yf/qAuhL
wlIZW8e5u72g6UDd8pzZzsLp050HJL6D5RJGln3/D41Ovg2UaUYSqcJw+AFA
5U9cmHj+7aaRHaEVqaxbcHCWulD1ayN5T42EhEx3j5BJC7xeI+dWaqfLBTgm
dHm8cDCBjAYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQ6Gqc0YRrzi6w4+sw
QGUDM4BgTxHOYZpR3/stp6XdF5dt+LH+MVKobcQqw8f7d9t6ErChN/x2hRav
KnKyBQOSoeXYCwc8Mx0OWxI0yFu4uvFYDAT1KqWFYbuF39/xwcAtdd7brWyR
SQj5KZjJjZ6I7hGq]
aes::auth::keytab_devel
:
>
ENC[PKCS7,MIIBygYJKoZIhvcNAQcDoIIBuzCCAbcCAQAxggEhMIIBHQIBADAFMAACAQEw
DQYJKoZIhvcNAQEBBQAEggEAV6TzhtqZfmrgF+c/ExBVJIuKQqgGGoaA1gRL
q4JFbg9iDV1PsocvOWk7SCfPL7HnnEwnqSNPHSGXpW6n8x+3jevGeutnCnxY
FPSt6icAVfoF0m6ih7ls+NPKab8iAXbucWG2zhOq2IgYquKE2E7HZU87gIM0
w0h2aWgWw6Dnn90MhgwHl3p8RmielDu3XByM8NQ8Mvym7oNZTrcIFne1qoay
2t6aSyXDMRAx+3EtpbNLwkPk5I395Rt1YlsZWXjT+2s0sr1+1S1ECGOJZNWq
s2CEd3JoYD6mQn3ng7I2Rzzvrfl/tKYm1SJY7MDsKHZLKNcxSLdjPJQeUx3i
R+qfRjCBjAYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQlXwrYkHkhsX0d7VY
GOSYr4Bg3/0GZbAt5i4epB6AfnweBJcwPrdVyo91tY/cOyTlqJwZnFhuY281
3Dvy4xliNgqm8nzsX2fG5kMHnB74Y2JQPsGb0ZnZfCwak9JfPqQzZmuvWMhA
Fgsv+Aw8HmVNvJC4]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
manifests/auth.pp
+
27
−
1
View file @
dfd15ce6
class
aes::auth
{
class
aes::auth
(
Optional
[
String
]
$keytab_production
=
undef
,
Optional
[
String
]
$keytab_devel
=
undef
,
){
$auth_user
=
auth
$auth_user
=
auth
$auth_group
=
"
${auth_user}
"
$auth_group
=
"
${auth_user}
"
$auth_home
=
"/srv/
${auth_user}
"
$auth_home
=
"/srv/
${auth_user}
"
$auth_service
=
"aes_auth"
$auth_service
=
"aes_auth"
# Pick the right keytab for the current environment. We use the fqdn rather than
# $environment since the keys are tied to the domain name rather than what
# environment the machine is configured in.
if
$facts
[
fqdn
]
==
'aes.edu.liu.se'
{
$keytab
=
$keytab_production
}
elsif
$facts
[
fqdn
]
==
'aes-devel.edu.liu.se'
{
$keytab
=
$keytab_devel
}
# Note: We rely on Boost being installed by the broker. It seems Puppet does not like
# Note: We rely on Boost being installed by the broker. It seems Puppet does not like
# that we specify "boost" multiple times, even though it would look nice, modularity-wise
# that we specify "boost" multiple times, even though it would look nice, modularity-wise
# since both the auth server and the broker requires boost.
# since both the auth server and the broker requires boost.
...
@@ -73,6 +85,20 @@ class aes::auth {
...
@@ -73,6 +85,20 @@ class aes::auth {
source
=>
"puppet:///modules/
${module_name}
/auth/start.sh"
,
source
=>
"puppet:///modules/
${module_name}
/auth/start.sh"
,
}
}
file
{
"
${auth_home}
/keys"
:
ensure
=>
directory
,
owner
=>
"
${auth_user}
"
,
group
=>
"
${auth_group}
"
,
mode
=>
"0700"
}
file
{
"
${auth_home}
/keys/kerberos.keytab"
:
ensure
=>
file
,
owner
=>
root
,
group
=>
"
${auth_group}
"
,
mode
=>
"0640"
}
exec
{
'update-auth-repo'
:
exec
{
'update-auth-repo'
:
command
=>
"/opt/utils/update_repo.sh
${auth_home}
/src https://oauth2:F-agHaRXCdyFy38q4c-N@gitlab.liu.se/upp-aes/communication.git production"
,
command
=>
"/opt/utils/update_repo.sh
${auth_home}
/src https://oauth2:F-agHaRXCdyFy38q4c-N@gitlab.liu.se/upp-aes/communication.git production"
,
environment
=>
[
"REPO_USER=
${auth_user}
"
,
"REPO_GROUP=
${auth_group}
"
,
"REPO_ON_UPDATE=
${auth_home}
/on_update.sh"
],
environment
=>
[
"REPO_USER=
${auth_user}
"
,
"REPO_GROUP=
${auth_group}
"
,
"REPO_ON_UPDATE=
${auth_home}
/on_update.sh"
],
...
...
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