thomas
/
sovereign
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Simplified vars with better defaults

Luke Cyca 11 years ago
parent
37a0400c22
commit
60afd1a033
2 changed files with 91 additions and 137 deletions
Split View Show Diff Stats
  1. 36
    60
      vars/defaults.yml
  2. 55
    77
      vars/user.yml

+ 36
- 60
vars/defaults.yml View File 

@@ -1,69 +1,48 @@
1 1 
 ---
2 2 
 ###############################################################################
3 
-# DO NOT EDIT. Set your variables in `vars/user.yml` instead. This is a
4 
-# reference of all the variables.
3 
+# DO NOT EDIT. Set your variables in `vars/user.yml` instead.
4 
+# This is a reference of all the variables.
5 5 
 ###############################################################################
6 6
7 7 
 # # common
8 
-# domain: TODO.com
9 
-# main_user_name: TODO
10 
-# admin_email: TODO@TODO.com
11 
-# encfs_password: TODO
12 
-# server_ip_address: TODO
8 
+# domain: (required)
9 
+# main_user_name: (required)
10 
+admin_email: "{{ main_user_name }}@{{ domain }}"
11 
+# encfs_password: (required)
12 
+# server_ip_address: (required)
13 13
14 14 
 # ircbouncer
15 15 
 znc_version: 1.0
16 
-# irc_nick: TODO
17 
-# irc_ident: TODO
18 
-# irc_realname: TODO
19 
-# irc_quitmsg: TODO
20 
-# irc_password_hash: TODO
21 
-
22 
-# # mailserver
23 
-# mail_server_hostname: mail.TODO.com
24 
-# mail_mysql_username: mailuser
25 
-# mail_mysql_password: TODO
26 
-# mail_mysql_database: mailserver
27 
-# mail_virtual_domains:
28 
-#   - name: TODO
29 
-#     pk_id: 1
30 
-#     primary_user: TODO
31 
-#   - name: TODO
32 
-#     pk_id: 2
33 
-#     primary_user: TODO
34 
-# mail_virtual_users:
35 
-#   - address: TODO@TODO.com
36 
-#     password_hash: TODO
37 
-#     domain_pk_id: 1
38 
-#   - address: TODO@TODO.com
39 
-#     password_hash: TODO@TODO.com
40 
-#     domain_pk_id: 2
41 
-# mail_virtual_aliases:
42 
-#   - source: root@TODO.com
43 
-#     destination: TODO@TODO.com
44 
-#     domain_pk_id: 1
45 
-#   - source: postmaster@TODO.com
46 
-#     destination: TODO@TODO.com
47 
-#     domain_pk_id: 1
48 
-
49 
-# # monitoring
50 
-
51 
-
52 
-# # owncloud
53 
-# owncloud_domain: cloud.TODO.com
54 
-# owncloud_mysql_username: owncloud
55 
-# owncloud_mysql_password: TODO
56 
-# owncloud_mysql_database: owncloud
16 
+# irc_nick: (required)
17 
+# irc_ident: (required)
18 
+# irc_realname: (required)
19 
+# irc_quitmsg: (required)
20 
+# irc_password_hash: (required)
21 
+
22 
+# mailserver
23 
+mail_server_hostname: "mail.{{ domain }}"
24 
+mail_mysql_username: mailuser
25 
+# mail_mysql_password: (required)
26 
+mail_mysql_database: mailserver
27 
+# mail_virtual_domains: (required)
28 
+# mail_virtual_users: (required)
29 
+# mail_virtual_aliases: (required)
30 
+
31 
+# owncloud
32 
+owncloud_domain: "cloud.{{ domain }}"
33 
+owncloud_mysql_username: owncloud
34 
+# owncloud_mysql_password: (required)
35 
+owncloud_mysql_database: owncloud
57 36
58 37 
 # tarsnap
59 38 
 tarsnap_version: 1.0.35
60 39
61 
-# # vpn
62 
-openvpn_key_country:  "US"
63 
-openvpn_key_province: "California"
64 
-openvpn_key_city: "Beverly Hills"
65 
-openvpn_key_org: "ACME CORPORATION"
66 
-openvpn_key_ou: "Anvil Department"
40 
+# vpn
41 
+# openvpn_key_country: (required)
42 
+# openvpn_key_province: (required)
43 
+# openvpn_key_city: (required)
44 
+# openvpn_key_org: (required)
45 
+# openvpn_key_ou: (required)
67 46 
 openssl_request_subject: "/C={{ openvpn_key_country }}/ST={{ openvpn_key_province }}/L={{ openvpn_key_city }}/O={{ openvpn_key_org }}/OU={{ openvpn_key_ou }}"
68 47 
 openvpn_key_size: "2048"
69 48 
 openvpn_cipher: "BF-CBC"
 
@@ -72,10 +51,7 @@ openvpn_path: "/etc/openvpn"
72 51 
 openvpn_ca: "{{ openvpn_path }}/ca"
73 52 
 openvpn_dhparam: "{{ openvpn_path }}/dh{{ openvpn_key_size }}.pem"
74 53 
 openvpn_hmac_firewall: "{{ openvpn_path }}/ta.key"
75 
-openvpn_clients:
76 
-  - laptop
77 
-  - phone
78 
-  - tablet
54 
+# openvpn_clients: (required)
79 55
80 
-# # webmail
81 
-# webmail_domain: TODO.com
56 
+# webmail
57 
+webmail_domain: "mail.{{ domain }}"

+ 55
- 77
vars/user.yml View File 

@@ -1,81 +1,59 @@
1 1 
 ---
2 2 
 ###############################################################################
3 
-# Uncomment and set your variables here. For a complete reference look at the
4 
-# `vars/defaults.yml` file.
3 
+# Set your variables here.
4 
+# For a complete reference look at the `vars/defaults.yml` file.
5 5 
 ###############################################################################
6 6
7 
-# # common
8 
-# domain: TODO.com
9 
-# main_user_name: TODO
10 
-# admin_email: TODO@TODO.com
11 
-# encfs_password: TODO
12 
-# server_ip_address: TODO
13 
-
14 
-# # ircbouncer
15 
-# znc_version: 1.0
16 
-# irc_nick: TODO
17 
-# irc_ident: TODO
18 
-# irc_realname: TODO
19 
-# irc_quitmsg: TODO
20 
-# irc_password_hash: TODO
21 
-
22 
-# # mailserver
23 
-# mail_server_hostname: mail.TODO.com
24 
-# mail_mysql_username: mailuser
25 
-# mail_mysql_password: TODO
26 
-# mail_mysql_database: mailserver
27 
-# mail_virtual_domains:
28 
-#   - name: TODO
29 
-#     pk_id: 1
30 
-#     primary_user: TODO
31 
-#   - name: TODO
32 
-#     pk_id: 2
33 
-#     primary_user: TODO
34 
-# mail_virtual_users:
35 
-#   - address: TODO@TODO.com
36 
-#     password_hash: TODO
37 
-#     domain_pk_id: 1
38 
-#   - address: TODO@TODO.com
39 
-#     password_hash: TODO@TODO.com
40 
-#     domain_pk_id: 2
41 
-# mail_virtual_aliases:
42 
-#   - source: root@TODO.com
43 
-#     destination: TODO@TODO.com
44 
-#     domain_pk_id: 1
45 
-#   - source: postmaster@TODO.com
46 
-#     destination: TODO@TODO.com
47 
-#     domain_pk_id: 1
48 
-
49 
-# # monitoring
50 
-
51 
-
52 
-# # owncloud
53 
-# owncloud_domain: cloud.TODO.com
54 
-# owncloud_mysql_username: owncloud
55 
-# owncloud_mysql_password: TODO
56 
-# owncloud_mysql_database: owncloud
57 
-
58 
-# # tarsnap
59 
-# tarsnap_version: 1.0.35
60 
-
61 
-# # vpn
62 
-# openvpn_key_country:  "US"
63 
-# openvpn_key_province: "California"
64 
-# openvpn_key_city: "Beverly Hills"
65 
-# openvpn_key_org: "ACME CORPORATION"
66 
-# openvpn_key_ou: "Anvil Department"
67 
-# openssl_request_subject: "/C={{ openvpn_key_country }}/ST={{ openvpn_key_province }}/L={{ openvpn_key_city }}/O={{ openvpn_key_org }}/OU={{ openvpn_key_ou }}"
68 
-# openvpn_key_size: "2048"
69 
-# openvpn_cipher: "BF-CBC"
70 
-# openvpn_auth_digest: "SHA1"
71 
-# openvpn_path: "/etc/openvpn"
72 
-# openvpn_ca: "{{ openvpn_path }}/ca"
73 
-# openvpn_dhparam: "{{ openvpn_path }}/dh{{ openvpn_key_size }}.pem"
74 
-# openvpn_hmac_firewall: "{{ openvpn_path }}/ta.key"
75 
-# openvpn_clients:
76 
-#   - laptop
77 
-#   - phone
78 
-#   - tablet
79 
-
80 
-# # webmail
81 
-# webmail_domain: TODO.com
7 
+# common
8 
+domain: TODO.com
9 
+main_user_name: TODO
10 
+encfs_password: TODO
11 
+server_ip_address: TODO
12 
+
13 
+# ircbouncer
14 
+irc_nick: TODO
15 
+irc_ident: TODO
16 
+irc_realname: TODO
17 
+irc_quitmsg: TODO
18 
+irc_password_hash: TODO
19 
+
20 
+# mailserver
21 
+mail_mysql_password: TODO
22 
+mail_virtual_domains:
23 
+  - name: "{{ domain }}"
24 
+    pk_id: 1
25 
+    primary_user: "{{ main_user_name }}"
26 
+#  - name: TODO.com
27 
+#    pk_id: 2
28 
+#    primary_user: TODO
29 
+mail_virtual_users:
30 
+  - address: "{{ main_user_name }}@{{ domain }}"
31 
+    password_hash: TODO
32 
+    domain_pk_id: 1
33 
+#  - address: "TODO@{{ domain }}"
34 
+#    password_hash: TODO
35 
+#    domain_pk_id: 2
36 
+mail_virtual_aliases:
37 
+  - source: "root@{{ domain }}"
38 
+    destination: "{{ admin_email }}"
39 
+    domain_pk_id: 1
40 
+  - source: "postmaster@{{ domain }}"
41 
+    destination: "{{ admin_email }}"
42 
+    domain_pk_id: 1
43 
+  - source: "webmaster@{{ domain }}"
44 
+    destination: "{{ admin_email }}"
45 
+    domain_pk_id: 1
46 
+
47 
+# owncloud
48 
+owncloud_mysql_password: TODO
49 
+
50 
+# vpn
51 
+openvpn_key_country:  "US"
52 
+openvpn_key_province: "California"
53 
+openvpn_key_city: "Beverly Hills"
54 
+openvpn_key_org: "ACME CORPORATION"
55 
+openvpn_key_ou: "Anvil Department"
56 
+openvpn_clients:
57 
+  - laptop
58 
+  - phone
59 
+  - tablet

Write Preview
Loading…
Cancel
Save