Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ansible_lza_server_hardening
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Show more breadcrumbs
Digital Preservation
ansible_lza_server_hardening
Commits
79861b67
Commit
79861b67
authored
1 year ago
by
Jörg Sachse
Browse files
Options
Downloads
Patches
Plain Diff
style: use deb822 format and remove deprecated apt_key (resolves #2233 / ND-2723)
parent
b1064159
No related branches found
No related tags found
No related merge requests found
Pipeline
#5988
passed
1 year ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-1
2 additions, 1 deletion
.gitlab-ci.yml
molecule/resources/playbooks/prepare.yml
+21
-13
21 additions, 13 deletions
molecule/resources/playbooks/prepare.yml
molecule/virtualbox/molecule.yml
+1
-1
1 addition, 1 deletion
molecule/virtualbox/molecule.yml
with
24 additions
and
15 deletions
.gitlab-ci.yml
+
2
−
1
View file @
79861b67
...
@@ -16,7 +16,8 @@ variables:
...
@@ -16,7 +16,8 @@ variables:
SCENARIO
:
"
default"
SCENARIO
:
"
default"
# ANSIBLE_VAULT_PASSWORD_FILE: "molecule/lza_server_hardening.pass"
# ANSIBLE_VAULT_PASSWORD_FILE: "molecule/lza_server_hardening.pass"
ANSIBLE_VAULT_PASSWORD_FILE
:
"
../lza_server_hardening.pass"
ANSIBLE_VAULT_PASSWORD_FILE
:
"
../lza_server_hardening.pass"
ANSIBLE_FORCE_COLOR
:
'
true'
PY_COLORS
:
'
1'
test-job
:
test-job
:
stage
:
test
stage
:
test
...
...
This diff is collapsed.
Click to expand it.
molecule/resources/playbooks/prepare.yml
+
21
−
13
View file @
79861b67
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
hosts
:
"
*"
hosts
:
"
*"
pre_tasks
:
pre_tasks
:
-
name
:
configure additional package repositories for Debian
-
name
:
configure additional package repositories for Debian
when
:
ansible_os_family == "Debian"
block
:
block
:
-
name
:
install GPG
-
name
:
install GPG
ansible.builtin.apt
:
ansible.builtin.apt
:
...
@@ -10,21 +11,21 @@
...
@@ -10,21 +11,21 @@
state
:
latest
state
:
latest
update_cache
:
true
update_cache
:
true
become
:
true
become
:
true
-
name
:
add
GPG key for SLUB
Debian repo
sitory
-
name
:
add
custom repo for SLUB's custom
Debian repo
ansible.builtin.
apt_ke
y
:
ansible.builtin.
deb822_repositor
y
:
url
:
"
https://sdvdebianrepo.slub-dresden.de/deb-repository/pub.gpg.key
"
architectures
:
"
amd64
"
state
:
present
components
:
"
main"
become
:
true
enabled
:
true
-
name
:
add repo URL to sources.list
name
:
"
slub"
ansible.builtin.apt_repository
:
pdiffs
:
true
repo
:
"
deb
https://sdvdebianrepo.slub-dresden.de/deb-repository
bookworm
main
"
signed_by
:
"
https://sdvdebianrepo.slub-dresden.de/deb-repository
/pub.gpg.key
"
s
ta
te
:
present
s
ui
te
s
:
"
{{
ansible_lsb.codename
}}"
u
pdate_cache
:
true
u
ris
:
"
https://sdvdebianrepo.slub-dresden.de/deb-repository"
mode
:
"
0644"
notify
:
update package cache
become
:
true
become
:
true
when
:
ansible_os_family == "Debian"
-
name
:
configure additional package repositories for RedHat
-
name
:
configure additional package repositories for RedHat
when
:
ansible_os_family == "RedHat"
block
:
block
:
-
name
:
add custom repositories
-
name
:
add custom repositories
ansible.builtin.yum_repository
:
ansible.builtin.yum_repository
:
...
@@ -42,13 +43,14 @@
...
@@ -42,13 +43,14 @@
description
:
SLUB YUM repo
description
:
SLUB YUM repo
baseurl
:
"
https://sdvrhelrepo.slub-dresden.de/"
baseurl
:
"
https://sdvrhelrepo.slub-dresden.de/"
gpgcheck
:
"
false"
gpgcheck
:
"
false"
notify
:
update package cache
become
:
true
become
:
true
-
name
:
remove legacy repo configuration to avoid double configuration for SLUB repo
-
name
:
remove legacy repo configuration to avoid double configuration for SLUB repo
ansible.builtin.file
:
ansible.builtin.file
:
path
:
"
/etc/yum.repos.d/SLUB.repo"
path
:
"
/etc/yum.repos.d/SLUB.repo"
state
:
absent
state
:
absent
become
:
true
become
:
true
when
:
ansible_os_family == "RedHat"
notify
:
update package cache
# This Ansible role installs a multitude of firewall rules, some of which
# This Ansible role installs a multitude of firewall rules, some of which
# will lock us out of our Molecule test VM if we don't take precautions.
# will lock us out of our Molecule test VM if we don't take precautions.
...
@@ -70,3 +72,9 @@
...
@@ -70,3 +72,9 @@
source
:
"
{{
ansible_default_ipv4.address
|
ansible.utils.ipaddr('network')
}}/24"
source
:
"
{{
ansible_default_ipv4.address
|
ansible.utils.ipaddr('network')
}}/24"
destination_port
:
"
22"
destination_port
:
"
22"
become
:
true
become
:
true
handlers
:
-
name
:
update package cache
ansible.builtin.package
:
update_cache
:
true
become
:
true
This diff is collapsed.
Click to expand it.
molecule/virtualbox/molecule.yml
+
1
−
1
View file @
79861b67
...
@@ -13,7 +13,7 @@ platforms:
...
@@ -13,7 +13,7 @@ platforms:
# https://github.com/ansible-community/molecule-vagrant#documentation
# https://github.com/ansible-community/molecule-vagrant#documentation
# for more platform parameters.
# for more platform parameters.
-
name
:
vm-runner
-
name
:
vm-runner
box
:
debian/b
ullseye
64
box
:
debian/b
ookworm
64
memory
:
1024
memory
:
1024
# List of raw Vagrant `config` options.
# List of raw Vagrant `config` options.
# provider_raw_config_args:
# provider_raw_config_args:
...
...
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