Pārlūkot izejas kodu

Update testing to work with modularized Sovereign

* Harvest testing configuration into group variables
* Define testing group for Vagrant to use
* Move testing passwords to secrets directory that Vagrant uses
* Update .gitignore to keep the testing secrets
Mike Ashley 8 gadus atpakaļ
vecāks
revīzija
2ca703a90a

+ 2
- 2
.gitignore Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/db_admin_password Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/encfs_password Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/mail_db_opendmarc_password Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/mail_db_password Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/owncloud_db_password Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/selfoss_db_password Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/selfoss_password_hash Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/wallabag_db_password Parādīt failu

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

+ 1
- 0
.vagrant/provisioners/ansible/inventory/secret/wallabag_salt Parādīt failu

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

+ 3
- 0
Vagrantfile Parādīt failu

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

tests/testing.yml → group_vars/testing Parādīt failu

@@ -1,32 +1,23 @@
1 1
 ---
2 2
 ###############################################################################
3
-# Variables used when testing with Vagrant
4
-# For a complete reference look at the `vars/defaults.yml` file.
3
+# Variables used when testing with Vagrant.  Secrets are stored in
4
+# `.vagrant/provisioners/ansible/inventory/secret.
5
+#
6
+# selfoss_password_hash is the SHA512 hash of `foo`
7
+# 
5 8
 ###############################################################################
6 9
 
7 10
 # common
8
-common_timezone: 'Etc/UTC'
9 11
 domain: sovereign.local
10 12
 main_user_name: sovereign
11
-encfs_password: testPassword
12 13
 friendly_networks:
13 14
   - "172.16.100.0/24"
14 15
 
15
-db_admin_username: postgres
16
-db_admin_password: postgres
17
-
18
-# ircbouncer
19
-irc_nick: sovereign
20
-irc_ident: sovereign
21
-irc_realname: Mr. Sovereign
22
-irc_quitmsg: Bye
23
-irc_password_hash: "310c5f99825e80d5b1d663a0a993b8701255f16b2f6056f335ba6e3e720e57ed" #foo
24
-irc_password_salt: "YdlPM5yjBmc/;JO6cfL5"
25
-irc_timezone: "America/New_York" #Example: "America/New_York"
16
+# admin email
17
+# fail2ban reports will be sent to this address
18
+admin_email: "{{ main_user_name }}@{{ domain }}"
26 19
 
27 20
 # mailserver
28
-mail_db_password: testPassword
29
-mail_db_opendmarc_password: testPassword
30 21
 mail_virtual_domains:
31 22
   - name: "{{ domain }}"
32 23
     pk_id: 1
@@ -45,15 +36,26 @@ mail_virtual_aliases:
45 36
   - source: "webmaster@{{ domain }}"
46 37
     destination: "{{ admin_email }}"
47 38
     domain_pk_id: 1
48
-mail_header_privacy: 1
49 39
 
50
-# z-push
51
-zpush_timezone: "America/New_York"  #Example: "America/New_York"
40
+# timezone
41
+# common_timezone will be used in the common and mailserver roles
42
+common_timezone: 'Etc/UTC'
43
+
44
+# znc
45
+irc_nick: sovereign
46
+irc_ident: sovereign
47
+irc_realname: Mr. Sovereign
48
+irc_quitmsg: Bye
49
+irc_password_hash: "310c5f99825e80d5b1d663a0a993b8701255f16b2f6056f335ba6e3e720e57ed" #foo
50
+irc_password_salt: "YdlPM5yjBmc/;JO6cfL5"
51
+irc_timezone: "America/New_York" #Example: "America/New_York"
52 52
 
53
-# owncloud
54
-owncloud_db_password: testPassword
53
+# xmpp
54
+prosody_accounts:
55
+  - name: "{{ main_user_name }}"
56
+    password: foo
55 57
 
56
-# vpn
58
+# openvpn
57 59
 openvpn_key_country:  "US"
58 60
 openvpn_key_province: "California"
59 61
 openvpn_key_city: "Beverly Hills"
@@ -63,22 +65,3 @@ openvpn_clients:
63 65
   - laptop
64 66
   - phone
65 67
   - tablet
66
-
67
-# webmail
68
-webmail_db_password: testPassword
69
-
70
-# xmpp
71
-prosody_accounts:
72
-  - name: "{{ main_user_name }}"
73
-    password: foo
74
-
75
-# selfoss
76
-selfoss_db_password: testPassword
77
-selfoss_username: "{{ main_user_name }}"
78
-# this is the sha512 hash of the desired password
79
-selfoss_password_hash: "f7fbba6e0636f890e56fbbf3283e524c6fa3204ae298382d624741d0dc6638326e282c41be5e4254d8820772c5518a2c5a8c0c7f7eda19594a7eb539453e1ed7"
80
-# foo
81
-
82
-# wallabag
83
-wallabag_salt: testing
84
-wallabag_db_password: testPassword

Notiek ielāde…
Atcelt
Saglabāt