Merge branch 'dhparam-dsaparam' of https://github.com/ckousik/debops …

…into ckousik-dhparam-dsaparam
debops · Aug 16, 2019 · 5451af8 · 5451af8
2 parents 7f116ca + 29cd272
commit 5451af8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ansible/roles/debops.dhparam/defaults/main.yml b/ansible/roles/debops.dhparam/defaults/main.yml
@@ -156,6 +156,11 @@ dhparam__generate_log: True
 # run at the end of the Diffie-Hellman generator script using ``run-parts``.
 dhparam__hook_path: '{{ dhparam__path + "/hooks.d" }}'
                                                                    # ]]]
+# .. envvar:: dhparam__openssl_options [[[
+#
+# Provide additional options to the openssl dhparam generator (eg. -dsaparam).
+dhparam__openssl_options: ''
+                                                                   # ]]]
                                                                    # ]]]
 # Initial Diffie-Hellman re-generation [[[
 # ----------------------------------------

diff --git a/ansible/roles/debops.dhparam/tasks/main.yml b/ansible/roles/debops.dhparam/tasks/main.yml
@@ -43,7 +43,7 @@
              --outfile {{ dhparam__source_path + "/" + dhparam__prefix + item + dhparam__suffix }}
              --bits {{ item }}
     {% elif dhparam__source_library == 'openssl' %}
-    openssl dhparam -out {{ dhparam__source_path + "/" + dhparam__prefix + item + dhparam__suffix }} {{ item }}
+    openssl dhparam {{ dhparam__openssl_options }} -out {{ dhparam__source_path + "/" + dhparam__prefix + item + dhparam__suffix }} {{ item }}
     {% endif %}
   args:
     creates: '{{ dhparam__source_path + "/" + dhparam__prefix + item + dhparam__suffix }}'