Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
infrastructure
Commits
891e729c
Commit
891e729c
authored
Sep 06, 2017
by
Florian Pritz
Browse files
borg-client: Adapt for FQDN
Signed-off-by:
Florian Pritz
<
bluewind@xinu.at
>
parent
4f047cf5
Changes
8
Hide whitespace changes
Inline
Side-by-side
host_vars/apollo.archlinux.org
View file @
891e729c
...
...
@@ -11,3 +11,9 @@ ipv6_gateway: "fe80::1"
filesystem: btrfs
zabbix_agent_server: "127.0.0.1"
# FIXME: this should probably be configured another way. maybe the
# mysql/postgres roles should deploy the credentials themselves
postgres_backup_dir: "/var/lib/postgres/backup"
mysql_backup_dir: "/root/backup-mysql"
mysql_backup_defaults: "/root/.backup-my.cnf"
host_vars/soyuz.archlinux.org
View file @
891e729c
...
...
@@ -9,3 +9,4 @@ ipv6_gateway: "fe80::1"
default_qdisc: "fq"
tcp_congestion_control: "bbr"
filesystem: btrfs
postgres_backup_dir: "/var/lib/postgres/backup"
playbooks/apollo.yml
View file @
891e729c
...
...
@@ -22,7 +22,7 @@
-
{
role
:
tools
,
tags
:
[
'
tools'
]
}
-
{
role
:
sshd
,
tags
:
[
'
sshd'
]
}
-
{
role
:
root_ssh
,
tags
:
[
'
root_ssh'
]
}
-
{
role
:
borg-client
,
backup_host
:
"
borg@vostok.archlinux.org"
,
backup_dir
:
"
/backup/apollo"
,
postgres_backup_dir
:
"
/var/lib/postgres/backup"
,
mysql_backup_dir
:
"
/root/backup-mysql"
,
mysql_backup_defaults
:
"
/root/.backup-my.cnf"
,
tags
:
[
"
borg"
]
}
-
{
role
:
borg-client
,
tags
:
[
"
borg"
]
}
-
{
role
:
nginx
,
letsencrypt_validation_dir
:
"
/var/lib/letsencrypt"
,
tags
:
[
"
nginx"
]
}
-
{
role
:
planet
,
planet_domain
:
"
planet.archlinux.org"
,
planet_dir
:
"
/srv/http/planet"
,
tags
:
[
"
planet"
]
}
-
{
role
:
spampd
,
tags
:
[
"
mail"
,
"
spampd"
]
}
...
...
playbooks/orion.yml
View file @
891e729c
...
...
@@ -11,7 +11,7 @@
-
{
role
:
tools
,
tags
:
[
'
tools'
]
}
-
{
role
:
sshd
,
tags
:
[
'
sshd'
]
}
-
{
role
:
root_ssh
,
tags
:
[
'
root_ssh'
]
}
-
{
role
:
borg-client
,
backup_host
:
"
borg@vostok.archlinux.org"
,
backup_dir
:
"
/backup/orion"
,
postgres_backup_dir
:
None
,
tags
:
[
'
borg'
]
}
-
{
role
:
borg-client
,
tags
:
[
'
borg'
]
}
-
{
role
:
opendkim
,
dkim_selector
:
orion
,
tags
:
[
'
mail'
]
}
-
{
role
:
dovecot
,
tags
:
[
'
mail'
,
"
dovecot"
]
}
-
{
role
:
spampd
,
tags
:
[
"
mail"
,
"
spampd"
]
}
...
...
playbooks/soyuz.yml
View file @
891e729c
...
...
@@ -8,7 +8,7 @@
-
{
role
:
tools
,
tags
:
[
'
tools'
]
}
-
{
role
:
sshd
,
tags
:
[
'
sshd'
]
}
-
{
role
:
root_ssh
,
tags
:
[
'
root_ssh'
]
}
-
{
role
:
borg-client
,
backup_host
:
"
borg@vostok.archlinux.org"
,
backup_dir
:
"
/backup/soyuz"
,
postgres_backup_dir
:
"
/var/lib/postgres/backup"
,
tags
:
[
'
borg'
]
}
-
{
role
:
borg-client
,
tags
:
[
'
borg'
]
}
-
{
role
:
opendkim
,
dkim_selector
:
soyuz
,
tags
:
[
'
mail'
]
}
-
{
role
:
postfix
,
postfix_server
:
false
,
tags
:
[
"
mail"
,
"
postfix"
]
}
-
{
role
:
archusers
,
tags
:
[
'
archusers'
]
}
...
...
playbooks/vostok.yml
View file @
891e729c
...
...
@@ -8,4 +8,4 @@
-
tools
-
sshd
-
{
role
:
root_ssh
,
tags
:
[
'
root_ssh'
]
}
-
{
role
:
borg-server
,
backup_dir
:
"
/backup"
,
backup_clients
:
[
"
orion"
,
"
apollo"
,
"
soyuz
"
]
}
-
{
role
:
borg-server
,
backup_dir
:
"
/backup"
,
backup_clients
:
"
{{groups['borg-clients']}}"
,
tags
:
[
"
borg
"
]
}
roles/borg-client/defaults/main.yml
View file @
891e729c
---
postgres_backup_dir
:
'
'
backup_host
:
"
borg@vostok.archlinux.org"
backup_dir
:
"
/backup/{{inventory_hostname}}"
postgres_backup_dir
:
None
mysql_backup_dir
:
'
'
mysql_backup_defaults
:
'
'
roles/borg-server/tasks/main.yml
View file @
891e729c
...
...
@@ -16,7 +16,7 @@
-
name
:
fetch ssh keys
command
:
cat /root/.ssh/id_rsa.pub
register
:
ssh_keys
delegate_to
:
"
{{
groups[item][0]
}}"
delegate_to
:
"
{{
item
}}"
with_items
:
"
{{
backup_clients
}}"
-
name
:
allow certain clients to connect
...
...
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