thomas
/
sovereign
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

Comment defaults 

That way the default values will not be applied by mistake. The user
needs to uncomment the lines from `vars/users.yml` and set them.

Also renamed openvpn variables.

Refs #39
Greg Karékinian hace 11 años
padre
58dddc55d1
commit
1e9a560ff6
Se han modificado 3 ficheros con 126 adiciones y 126 borrados
Dividir vista Mostrar estadísticas de diff
  1. 8
    8
      roles/vpn/templates/etc_openvpn_easy-rsa_2.0_vars.j2
  2. 56
    56
      vars/defaults.yml
  3. 62
    62
      vars/user.yml

+ 8
- 8
roles/vpn/templates/etc_openvpn_easy-rsa_2.0_vars.j2 Ver fichero 

@@ -60,13 +60,13 @@ export KEY_EXPIRE=3650
60 60 
 # These are the default values for fields
61 61 
 # which will be placed in the certificate.
62 62 
 # Don't leave any of these fields blank.
63 
-export KEY_COUNTRY="{{ key_country }}"
64 
-export KEY_PROVINCE="{{ key_province }}"
65 
-export KEY_CITY="{{ key_city }}"
66 
-export KEY_ORG="{{ key_org }}"
67 
-export KEY_EMAIL="{{ key_email }}"
68 
-export KEY_CN={{ key_cn }}
69 
-export KEY_NAME={{ key_name }}
70 
-export KEY_OU={{ key_ou }}
63 
+export KEY_COUNTRY="{{ openvpn_key_country }}"
64 
+export KEY_PROVINCE="{{ openvpn_key_province }}"
65 
+export KEY_CITY="{{ openvpn_key_city }}"
66 
+export KEY_ORG="{{ openvpn_key_org }}"
67 
+export KEY_EMAIL="{{ openvpn_key_email }}"
68 
+export KEY_CN={{ openvpn_key_cn }}
69 
+export KEY_NAME={{ openvpn_key_name }}
70 
+export KEY_OU={{ openvpn_key_ou }}
71 71 
 export PKCS11_MODULE_PATH=changeme
72 72 
 export PKCS11_PIN=1234

+ 56
- 56
vars/defaults.yml Ver fichero 

@@ -1,63 +1,63 @@
1 1 
 ---
2 
-# roles/blog/vars/main.yml
3 
-blog_domain: TODO.com
2 
+# blog
3 
+# blog_domain: TODO.com
4 4
5 
-# roles/common/vars/main.yml
6 
-main_user_name: TODO
7 
-admin_email: TODO@TODO.com
8 
-encfs_password: TODO
5 
+# common
6 
+# main_user_name: TODO
7 
+# admin_email: TODO@TODO.com
8 
+# encfs_password: TODO
9 9
10 
-# roles/ircbouncer/vars/main.yml
10 
+# ircbouncer
11 11 
 znc_version: 1.0
12 12
13 
-# roles/mailserver/vars/main.yml
14 
-mail_server_hostname: mail.TODO.com
15 
-mail_mysql_username: mailuser
16 
-mail_mysql_password: TODO
17 
-mail_mysql_database: mailserver
18 
-mail_virtual_domains:
19 
-  - name: TODO
20 
-    pk_id: 1
21 
-    primary_user: TODO
22 
-  - name: TODO
23 
-    pk_id: 2
24 
-    primary_user: TODO
25 
-mail_virtual_users:
26 
-  - address: TODO@TODO.com
27 
-    password_hash: TODO
28 
-    domain_pk_id: 1
29 
-  - address: TODO@TODO.com
30 
-    password_hash: TODO@TODO.com
31 
-    domain_pk_id: 2
32 
-mail_virtual_aliases:
33 
-  - source: root@TODO.com
34 
-    destination: TODO@TODO.com
35 
-    domain_pk_id: 1
36 
-  - source: postmaster@TODO.com
37 
-    destination: TODO@TODO.com
38 
-    domain_pk_id: 1
39 
-
40 
-# roles/monitoring/vars/main.yml
41 
-
42 
-
43 
-# roles/owncloud/vars/main.yml
44 
-owncloud_domain: cloud.TODO.com
45 
-owncloud_mysql_username: owncloud
46 
-owncloud_mysql_password: TODO
47 
-owncloud_mysql_database: owncloud
48 
-
49 
-# roles/tarsnap/vars/main.yml
13 
+# mailserver
14 
+# mail_server_hostname: mail.TODO.com
15 
+# mail_mysql_username: mailuser
16 
+# mail_mysql_password: TODO
17 
+# mail_mysql_database: mailserver
18 
+# mail_virtual_domains:
19 
+#   - name: TODO
20 
+#     pk_id: 1
21 
+#     primary_user: TODO
22 
+#   - name: TODO
23 
+#     pk_id: 2
24 
+#     primary_user: TODO
25 
+# mail_virtual_users:
26 
+#   - address: TODO@TODO.com
27 
+#     password_hash: TODO
28 
+#     domain_pk_id: 1
29 
+#   - address: TODO@TODO.com
30 
+#     password_hash: TODO@TODO.com
31 
+#     domain_pk_id: 2
32 
+# mail_virtual_aliases:
33 
+#   - source: root@TODO.com
34 
+#     destination: TODO@TODO.com
35 
+#     domain_pk_id: 1
36 
+#   - source: postmaster@TODO.com
37 
+#     destination: TODO@TODO.com
38 
+#     domain_pk_id: 1
39 
+
40 
+# monitoring
41 
+
42 
+
43 
+# owncloud
44 
+# owncloud_domain: cloud.TODO.com
45 
+# owncloud_mysql_username: owncloud
46 
+# owncloud_mysql_password: TODO
47 
+# owncloud_mysql_database: owncloud
48 
+
49 
+# tarsnap
50 50 
 tarsnap_version: 1.0.35
51 51
52 
-# roles/vpn/vars/main.yml
53 
-key_country: TODO
54 
-key_province: TODO
55 
-key_city: TODO
56 
-key_org: TODO
57 
-key_email: TODO
58 
-key_ou: TODO
59 
-key_cn: TODO
60 
-key_name: TODO
61 
-
62 
-# roles/webmail/vars/main.yml
63 
-webmail_domain: TODO.com
52 
+# vpn
53 
+# openvpn_key_country: TODO
54 
+# openvpn_key_province: TODO
55 
+# openvpn_key_city: TODO
56 
+# openvpn_key_org: TODO
57 
+# openvpn_key_email: TODO
58 
+# openvpn_key_ou: TODO
59 
+# openvpn_key_cn: TODO
60 
+# openvpn_key_name: TODO
61 
+
62 
+# webmail
63 
+# webmail_domain: TODO.com

+ 62
- 62
vars/user.yml Ver fichero 

@@ -1,63 +1,63 @@
1 1 
 ---
2 
-# roles/blog/vars/main.yml
3 
-blog_domain: TODO.com
4 
-
5 
-# roles/common/vars/main.yml
6 
-main_user_name: TODO
7 
-admin_email: TODO@TODO.com
8 
-encfs_password: TODO
9 
-
10 
-# roles/ircbouncer/vars/main.yml
11 
-znc_version: 1.0
12 
-
13 
-# roles/mailserver/vars/main.yml
14 
-mail_server_hostname: mail.TODO.com
15 
-mail_mysql_username: mailuser
16 
-mail_mysql_password: TODO
17 
-mail_mysql_database: mailserver
18 
-mail_virtual_domains:
19 
-  - name: TODO
20 
-    pk_id: 1
21 
-    primary_user: TODO
22 
-  - name: TODO
23 
-    pk_id: 2
24 
-    primary_user: TODO
25 
-mail_virtual_users:
26 
-  - address: TODO@TODO.com
27 
-    password_hash: TODO
28 
-    domain_pk_id: 1
29 
-  - address: TODO@TODO.com
30 
-    password_hash: TODO@TODO.com
31 
-    domain_pk_id: 2
32 
-mail_virtual_aliases:
33 
-  - source: root@TODO.com
34 
-    destination: TODO@TODO.com
35 
-    domain_pk_id: 1
36 
-  - source: postmaster@TODO.com
37 
-    destination: TODO@TODO.com
38 
-    domain_pk_id: 1
39 
-
40 
-# roles/monitoring/vars/main.yml
41 
-
42 
-
43 
-# roles/owncloud/vars/main.yml
44 
-owncloud_domain: cloud.TODO.com
45 
-owncloud_mysql_username: owncloud
46 
-owncloud_mysql_password: TODO
47 
-owncloud_mysql_database: owncloud
48 
-
49 
-# roles/tarsnap/vars/main.yml
50 
-tarsnap_version: 1.0.35
51 
-
52 
-# roles/vpn/vars/main.yml
53 
-key_country: TODO
54 
-key_province: TODO
55 
-key_city: TODO
56 
-key_org: TODO
57 
-key_email: TODO
58 
-key_ou: TODO
59 
-key_cn: TODO
60 
-key_name: TODO
61 
-
62 
-# roles/webmail/vars/main.yml
63 
-webmail_domain: TODO.com
2 
+# blog
3 
+# blog_domain: TODO.com
4 
+
5 
+# common
6 
+# main_user_name: TODO
7 
+# admin_email: TODO@TODO.com
8 
+# encfs_password: TODO
9 
+
10 
+# ircbouncer
11 
+# znc_version: 1.0
12 
+
13 
+# mailserver
14 
+# mail_server_hostname: mail.TODO.com
15 
+# mail_mysql_username: mailuser
16 
+# mail_mysql_password: TODO
17 
+# mail_mysql_database: mailserver
18 
+# mail_virtual_domains:
19 
+#   - name: TODO
20 
+#     pk_id: 1
21 
+#     primary_user: TODO
22 
+#   - name: TODO
23 
+#     pk_id: 2
24 
+#     primary_user: TODO
25 
+# mail_virtual_users:
26 
+#   - address: TODO@TODO.com
27 
+#     password_hash: TODO
28 
+#     domain_pk_id: 1
29 
+#   - address: TODO@TODO.com
30 
+#     password_hash: TODO@TODO.com
31 
+#     domain_pk_id: 2
32 
+# mail_virtual_aliases:
33 
+#   - source: root@TODO.com
34 
+#     destination: TODO@TODO.com
35 
+#     domain_pk_id: 1
36 
+#   - source: postmaster@TODO.com
37 
+#     destination: TODO@TODO.com
38 
+#     domain_pk_id: 1
39 
+
40 
+# monitoring
41 
+
42 
+
43 
+# owncloud
44 
+# owncloud_domain: cloud.TODO.com
45 
+# owncloud_mysql_username: owncloud
46 
+# owncloud_mysql_password: TODO
47 
+# owncloud_mysql_database: owncloud
48 
+
49 
+# tarsnap
50 
+# tarsnap_version: 1.0.35
51 
+
52 
+# vpn
53 
+# openvpn_key_country: TODO
54 
+# openvpn_key_province: TODO
55 
+# openvpn_key_city: TODO
56 
+# openvpn_key_org: TODO
57 
+# openvpn_key_email: TODO
58 
+# openvpn_key_ou: TODO
59 
+# openvpn_key_cn: TODO
60 
+# openvpn_key_name: TODO
61 
+
62 
+# webmail
63 
+# webmail_domain: TODO.com

Write Preview
Loading…
Cancelar
Guardar