Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Sébastien Luttringer
infrastructure
Commits
02b04fab
Verified
Commit
02b04fab
authored
Jun 25, 2020
by
Jelle van der Waa
🚧
Browse files
Migrate dbscripts, sogrep, archweb related services for mirrors to
gemini
parent
ba7b7906
Changes
3
Hide whitespace changes
Inline
Side-by-side
playbooks/apollo.yml
View file @
02b04fab
...
...
@@ -6,13 +6,13 @@
-
name
:
assign ipv4 addresses to fact postgres_ssl_hosts4
set_fact
:
postgres_ssl_hosts4="{{ [orion4] + detected_ips }}"
vars
:
orion4
:
"
{{
hostvars['
orion
.archlinux.org']['ipv4_address']
}}/32"
orion4
:
"
{{
hostvars['
gemini
.archlinux.org']['ipv4_address']
}}/32"
detected_ips
:
"
{{
groups['mirrors']
|
map('extract',
hostvars,
['ipv4_address'])
|
select()
|
map('regex_replace',
'^(.+)$',
'
\\
1/32')
|
list
}}"
tags
:
[
"
postgres"
,
"
firewall"
]
-
name
:
assign ipv6 addresses to fact postgres_ssl_hosts6
set_fact
:
postgres_ssl_hosts6="{{ [orion6] + detected_ips }}"
vars
:
orion6
:
"
{{
hostvars['
orion
.archlinux.org']['ipv6_address']
}}/128"
orion6
:
"
{{
hostvars['
gemini
.archlinux.org']['ipv6_address']
}}/128"
detected_ips
:
"
{{
groups['mirrors']
|
map('extract',
hostvars,
['ipv6_address'])
|
select()
|
map('regex_replace',
'^(.+)$',
'
\\
1/128')
|
list
}}"
tags
:
[
"
postgres"
,
"
firewall"
]
...
...
playbooks/gemini.archlinux.org.yml
View file @
02b04fab
...
...
@@ -3,6 +3,9 @@
-
name
:
setup gemini.archlinux.org
hosts
:
gemini.archlinux.org
remote_user
:
root
vars
:
archweb_db_host
:
'
apollo.archlinux.org'
dbscripts_commit
:
'
20191022'
roles
:
-
{
role
:
common
}
-
{
role
:
tools
}
...
...
@@ -14,6 +17,10 @@
-
{
role
:
zabbix-agent
}
-
{
role
:
certbot
}
-
{
role
:
nginx
}
-
{
role
:
dbscripts
,
repos_domain
:
"
repos.archlinux.org"
,
repos_rsync_domain
:
"
rsync.archlinux.org"
,
svntogit_repos
:
"
/srv/svntogit/repos"
,
postgres_ssl
:
'
on'
,
tags
:
[
'
archusers'
]
}
-
{
role
:
archweb
,
archweb_site
:
false
,
archweb_services
:
true
,
archweb_mirrorcheck_locations
:
[
5
,
6
]
}
-
{
role
:
sources
,
sources_domain
:
"
sources.archlinux.org"
,
sources_dir
:
"
/srv/sources"
}
-
{
role
:
archive
}
-
{
role
:
postfwd
,
tags
:
[
'
mail'
]
}
-
{
role
:
fail2ban
}
-
sogrep
playbooks/orion.yml
View file @
02b04fab
...
...
@@ -3,9 +3,6 @@
-
name
:
setup orion
hosts
:
orion.archlinux.org
remote_user
:
root
vars
:
archweb_db_host
:
'
apollo.archlinux.org'
dbscripts_commit
:
'
20191022'
roles
:
-
{
role
:
common
}
-
{
role
:
tools
}
...
...
@@ -22,10 +19,9 @@
-
{
role
:
archusers
}
-
{
role
:
certbot
}
-
{
role
:
nginx
}
-
{
role
:
dbscripts
,
repos_domain
:
"
repos.archlinux.org"
,
repos_rsync_domain
:
"
rsync.archlinux.org"
,
svntogit_repos
:
"
/srv/svntogit/repos"
,
postgres_ssl
:
'
on'
,
tags
:
[
'
archusers'
]
}
-
sogrep
-
{
role
:
sudo
,
tags
:
[
'
archusers'
]
}
-
{
role
:
archweb
,
archweb_site
:
false
,
archweb_services
:
tru
e
,
archweb_donor_import
:
true
,
archweb_mirrorcheck_locations
:
[
5
,
6
]
}
-
{
role
:
archweb
,
archweb_site
:
false
,
archweb_services
:
fals
e
,
archweb_donor_import
:
true
,
archweb_mirrorcheck_locations
:
[
5
,
6
]
}
-
{
role
:
hefur
,
ftp_iso_dir
:
'
/srv/ftp/iso'
,
tags
:
[
'
torrenttracker'
]}
-
wkd
-
{
role
:
fail2ban
}
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment