Merge pull request #568 from mikeashley/testing

Update testing to work with modularized Sovereign

.gitignore

@@ -1,4 +1,4 @@
-.vagrant
-vagrant_ansible_inventory_default
+.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
+.vagrant/machines
 tests.pyc
 secret

.vagrant/provisioners/ansible/inventory/secret/db_admin_password

@@ -0,0 +1 @@
+postgres

.vagrant/provisioners/ansible/inventory/secret/encfs_password

@@ -0,0 +1 @@
+testPassword

.vagrant/provisioners/ansible/inventory/secret/mail_db_opendmarc_password

@@ -0,0 +1 @@
+testPassword

.vagrant/provisioners/ansible/inventory/secret/mail_db_password

@@ -0,0 +1 @@
+testPassword

.vagrant/provisioners/ansible/inventory/secret/owncloud_db_password

@@ -0,0 +1 @@
+testPassword

.vagrant/provisioners/ansible/inventory/secret/selfoss_db_password

@@ -0,0 +1 @@
+testPassword

.vagrant/provisioners/ansible/inventory/secret/selfoss_password_hash

@@ -0,0 +1 @@
+f7fbba6e0636f890e56fbbf3283e524c6fa3204ae298382d624741d0dc6638326e282c41be5e4254d8820772c5518a2c5a8c0c7f7eda19594a7eb539453e1ed7

.vagrant/provisioners/ansible/inventory/secret/wallabag_db_password

@@ -0,0 +1 @@
+testPassword

.vagrant/provisioners/ansible/inventory/secret/wallabag_salt

@@ -0,0 +1 @@
+testing

Vagrantfile

@@ -8,6 +8,9 @@ Vagrant.configure('2') do |config|
     ansible.playbook = 'site.yml'
     ansible.host_key_checking = false
     ansible.extra_vars = { ansible_ssh_user: 'vagrant', testing: true }
+    ansible.groups = {
+      "testing" => ["jessie"]
+    }
 
     # ansible.tags = ['blog']
     # ansible.skip_tags = ['openvpn']

tests/testing.yml → group_vars/testing

@@ -1,32 +1,23 @@
 ---
 ###############################################################################
-# Variables used when testing with Vagrant
-# For a complete reference look at the `vars/defaults.yml` file.
+# Variables used when testing with Vagrant.  Secrets are stored in
+# `.vagrant/provisioners/ansible/inventory/secret.
+#
+# selfoss_password_hash is the SHA512 hash of `foo`
+# 
 ###############################################################################
 
 # common
-common_timezone: 'Etc/UTC'
 domain: sovereign.local
 main_user_name: sovereign
-encfs_password: testPassword
 friendly_networks:
   - "172.16.100.0/24"
 
-db_admin_username: postgres
-db_admin_password: postgres
-
-# ircbouncer
-irc_nick: sovereign
-irc_ident: sovereign
-irc_realname: Mr. Sovereign
-irc_quitmsg: Bye
-irc_password_hash: "310c5f99825e80d5b1d663a0a993b8701255f16b2f6056f335ba6e3e720e57ed" #foo
-irc_password_salt: "YdlPM5yjBmc/;JO6cfL5"
-irc_timezone: "America/New_York" #Example: "America/New_York"
+# admin email
+# fail2ban reports will be sent to this address
+admin_email: "{{ main_user_name }}@{{ domain }}"
 
 # mailserver
-mail_db_password: testPassword
-mail_db_opendmarc_password: testPassword
 mail_virtual_domains:
   - name: "{{ domain }}"
     pk_id: 1
@@ -45,15 +36,26 @@ mail_virtual_aliases:
   - source: "webmaster@{{ domain }}"
     destination: "{{ admin_email }}"
     domain_pk_id: 1
-mail_header_privacy: 1
 
-# z-push
-zpush_timezone: "America/New_York"  #Example: "America/New_York"
+# timezone
+# common_timezone will be used in the common and mailserver roles
+common_timezone: 'Etc/UTC'
+
+# znc
+irc_nick: sovereign
+irc_ident: sovereign
+irc_realname: Mr. Sovereign
+irc_quitmsg: Bye
+irc_password_hash: "310c5f99825e80d5b1d663a0a993b8701255f16b2f6056f335ba6e3e720e57ed" #foo
+irc_password_salt: "YdlPM5yjBmc/;JO6cfL5"
+irc_timezone: "America/New_York" #Example: "America/New_York"
 
-# owncloud
-owncloud_db_password: testPassword
+# xmpp
+prosody_accounts:
+  - name: "{{ main_user_name }}"
+    password: foo
 
-# vpn
+# openvpn
 openvpn_key_country:  "US"
 openvpn_key_province: "California"
 openvpn_key_city: "Beverly Hills"
@@ -63,22 +65,3 @@ openvpn_clients:
   - laptop
   - phone
   - tablet
-
-# webmail
-webmail_db_password: testPassword
-
-# xmpp
-prosody_accounts:
-  - name: "{{ main_user_name }}"
-    password: foo
-
-# selfoss
-selfoss_db_password: testPassword
-selfoss_username: "{{ main_user_name }}"
-# this is the sha512 hash of the desired password
-selfoss_password_hash: "f7fbba6e0636f890e56fbbf3283e524c6fa3204ae298382d624741d0dc6638326e282c41be5e4254d8820772c5518a2c5a8c0c7f7eda19594a7eb539453e1ed7"
-# foo
-
-# wallabag
-wallabag_salt: testing
-wallabag_db_password: testPassword