Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
infrastructure
Commits
76530490
Verified
Commit
76530490
authored
Nov 18, 2019
by
Sven-Hendrik Haase
Browse files
Fix ansible deprecation messages
parent
baf50096
Changes
9
Hide whitespace changes
Inline
Side-by-side
hosts
View file @
76530490
...
...
@@ -23,14 +23,14 @@ mex.mirror.pkgbuild.com
sgp.mirror.pkgbuild.com
ger.mirror.pkgbuild.com
[archive
-
mirrors]
[archive
_
mirrors]
ind.mirror.pkgbuild.com
jpn.mirror.pkgbuild.com
mex.mirror.pkgbuild.com
sgp.mirror.pkgbuild.com
ger.mirror.pkgbuild.com
[borg
-
clients]
[borg
_
clients]
orion.archlinux.org
apollo.archlinux.org
soyuz.archlinux.org
...
...
@@ -41,12 +41,12 @@ quassel.archlinux.org
phrik.archlinux.org
bbs.archlinux.org
[mysql
-
servers]
[mysql
_
servers]
apollo.archlinux.org
luna.archlinux.org
bbs.archlinux.org
[postgresql
-
servers]
[postgresql
_
servers]
apollo.archlinux.org
soyuz.archlinux.org
state.archlinux.org
...
...
@@ -63,7 +63,7 @@ dragon.archlinux.org
soyuz.archlinux.org
sgp.mirror.pkgbuild.com
[gitlab
-
runners]
[gitlab
_
runners]
runner1.archlinux.org
[reproduciblebuilds]
...
...
playbooks/all-hosts-basic.yml
View file @
76530490
...
...
@@ -11,6 +11,6 @@
# reconfiguring sshd may break the AUR on luna (unchecked)
#- { role: sshd, tags: ['sshd'] }
-
{
role
:
root_ssh
,
tags
:
[
'
root_ssh'
]
}
-
{
role
:
borg-client
,
tags
:
[
"
borg"
],
when
:
"
'borg
-
clients'
in
group_names"
}
-
{
role
:
borg-client
,
tags
:
[
"
borg"
],
when
:
"
'borg
_
clients'
in
group_names"
}
-
{
role
:
zabbix-agent
,
tags
:
[
"
zabbix"
,
"
zabbix-agent"
],
when
:
"
'unmanaged'
not
in
group_names"
}
-
{
role
:
hardening
}
playbooks/archive-mirrors.yml
View file @
76530490
---
-
name
:
common playbook for archive-mirrors
hosts
:
archive
-
mirrors
hosts
:
archive
_
mirrors
remote_user
:
root
roles
:
-
{
role
:
common
}
...
...
playbooks/gitlab-runners.yml
View file @
76530490
---
-
name
:
setup gitlab-runners
hosts
:
gitlab
-
runners
hosts
:
gitlab
_
runners
remote_user
:
root
roles
:
-
{
role
:
common
}
...
...
playbooks/tasks/fetch-borg-keys.yml
View file @
76530490
...
...
@@ -6,7 +6,7 @@
-
file
:
path="{{playbook_dir}}/../../borg-keys/" state=directory
-
name
:
fetch borg keys
hosts
:
borg
-
clients
hosts
:
borg
_
clients
tasks
:
-
name
:
fetch borg key
command
:
"
/usr/local/bin/borg
key
export
::
/dev/stdout"
...
...
playbooks/vostok.yml
View file @
76530490
...
...
@@ -9,4 +9,4 @@
-
{
role
:
sshd
,
tags
:
[
'
sshd'
]
}
-
{
role
:
unbound
}
-
{
role
:
root_ssh
,
tags
:
[
'
root_ssh'
]
}
-
{
role
:
borg-server
,
backup_dir
:
"
/backup"
,
backup_clients
:
"
{{groups['borg
-
clients']}}"
,
tags
:
[
"
borg"
]
}
-
{
role
:
borg-server
,
backup_dir
:
"
/backup"
,
backup_clients
:
"
{{groups['borg
_
clients']}}"
,
tags
:
[
"
borg"
]
}
roles/dbscripts/templates/rsyncd.conf.proto.j2
View file @
76530490
...
...
@@ -23,7 +23,7 @@ hosts deny = *
[archive]
path = /srv/archive
comment = archive
hosts allow = {{ groups['archive
-
mirrors'] | map('extract', hostvars, ['ipv4_address']) | join(' ') }}
hosts allow = {{ groups['archive
_
mirrors'] | map('extract', hostvars, ['ipv4_address']) | join(' ') }}
# Just the release/stable iso/packages (for most mirrors)
[ftp]
...
...
roles/sshd/templates/motd.j2
View file @
76530490
Welcome to {{inventory_hostname}}.
{% if 'borg
-
clients' in group_names %}
{% if 'borg
_
clients' in group_names %}
Data on this system is regularly backed up automatically.
{% else %}
[1;31mThis system IS NOT backed up.[0m Please ensure you DO NOT keep valuable data here!
...
...
roles/zabbix-agent/tasks/main.yml
View file @
76530490
...
...
@@ -11,7 +11,7 @@
-
name
:
install packages for borg monitoring
pacman
:
name=perl-json
when
:
"
'borg
-
clients'
in
group_names"
when
:
"
'borg
_
clients'
in
group_names"
-
name
:
install packages for nginx monitoring
pacman
:
name=perl-json,perl-clone,perl-statistics-descriptive
...
...
@@ -19,11 +19,11 @@
-
name
:
install mysql userstats monitoring packages
pacman
:
name=perl-dbi,perl-dbd-mysql,perl-json
when
:
"
'mysql
-
servers'
in
group_names"
when
:
"
'mysql
_
servers'
in
group_names"
-
name
:
install postgresql userstats monitoring packages
pacman
:
name=perl-dbi,perl-dbd-pg,perl-json
when
:
"
'postgresql
-
servers'
in
group_names"
when
:
"
'postgresql
_
servers'
in
group_names"
-
name
:
install memcached monitoring packages
pacman
:
name=python-memcached
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment