From c161524058d5bb0dc351aa8c377964e2d7dbb0d9 2016-01-11 16:47:43
From: Branko Majic <branko@majic.rs>
Date: 2016-01-11 16:47:43
Subject: [PATCH] MAR-44: Updated testsite documentation, mostly small tweaks. Include backup server itself as backup client (backing-up logs and the like).

---

diff --git a/docs/testsite.rst b/docs/testsite.rst
index d12dbc7d343dd8874d14b6b10e10f3bdda27cf5b..f4d91f877a027d84e1aac1432d7531d238b28e8d 100644
--- a/docs/testsite.rst
+++ b/docs/testsite.rst
@@ -50,6 +50,9 @@ web.yml
 xmpp.yml
   This playbook sets-up the XMPP server. It is included in ``site.yml``.
 
+backup.yml
+  This playbook sets-up the backup server. It is included in ``site.yml``.
+
 In order to deploy the test site, the following steps would normally be taken:
 
 1. As mentioned in introduction, default domain used by test site is
@@ -131,7 +134,6 @@ In order to deploy the test site, the following steps would normally be taken:
      mkdir ./backup_keyring
      chmod 700 ./backup_keyring
      cat << EOF | gpg2 --homedir ./backup_keyring --batch --gen-key
-     # Signing keys first.
      Key-Type:RSA
      Key-Length:1024
      Name-Real:ldap.example.com
@@ -156,7 +158,6 @@ In order to deploy the test site, the following steps would normally be taken:
      Expire-Date:0
      %commit
 
-     # This is the actual encryption key that will be used.
      Key-Type:RSA
      Key-Length:1024
      Name-Real:backup.example.com
@@ -179,7 +180,7 @@ In order to deploy the test site, the following steps would normally be taken:
 
     .. code-block:: shell
 
-      ssh-keyscan -t ed25519 mail.example.com ldap.example.com xmpp.example.com web.example.com $(resolveip -s mail.example.com) $(resolveip -s ldap.example.com) $(resolveip -s xmpp.example.com) $(resolveip -s web.example.com)
+      ssh-keyscan -t ed25519 mail.example.com ldap.example.com xmpp.example.com web.example.com backup.example.com $(resolveip -s mail.example.com) $(resolveip -s ldap.example.com) $(resolveip -s xmpp.example.com) $(resolveip -s web.example.com) $(resolveip -s backup.example.com)
 
 11. Invoke the ``bootstrap.yml`` playbook in order to set-up some basic
     environment for Ansible runs on all servers:
diff --git a/testsite/group_vars/backup.yml b/testsite/group_vars/backup.yml
index f86dd58dd8468855bc5bca0105d65f6a7411971e..2a279710eae0b379d600403feb104d5f343218a2 100644
--- a/testsite/group_vars/backup.yml
+++ b/testsite/group_vars/backup.yml
@@ -20,6 +20,9 @@ backup_clients:
   - server: xmpp.{{ testsite_domain }}
     public_key: "{{ lookup('file', inventory_dir + '/ssh/xmpp.' + testsite_domain + '.pub') }}"
     ip: 10.32.64.16
+  - server: backup.{{ testsite_domain }}
+    public_key: "{{ lookup('file', inventory_dir + '/ssh/backup.' + testsite_domain + '.pub') }}"
+    ip: 127.0.0.1
 
 backup_host_ssh_private_keys:
   dsa: "{{ lookup('file', inventory_dir + '/ssh/backup_server_dsa_key') }}"