Upgrade nginx role for Debian fix

galaxyproject · Nov 28, 2017 · ab736b6 · ab736b6
1 parent fd5886a
commit ab736b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/roles/galaxyproject.nginx/meta/.galaxy_install_info b/roles/galaxyproject.nginx/meta/.galaxy_install_info
@@ -1 +1 @@
-{install_date: 'Tue Nov 28 20:02:26 2017', version: '0.5'}
+{install_date: 'Tue Nov 28 20:44:26 2017', version: 0.5.1}
diff --git a/roles/galaxyproject.nginx/tasks/ssl.yml b/roles/galaxyproject.nginx/tasks/ssl.yml
@@ -1,5 +1,18 @@
 ---
 
+# Some versions of Debian set this in nginx.conf, and unlike other vars such as ssl_protocols, this does not override
+# other entires.
+- name: Disable ssl_prefer_server_ciphers in nginx.conf if set
+  lineinfile:
+    name: "{{ nginx_conf_dir }}/nginx.conf"
+    regexp: '^(\s*ssl_prefer_server_ciphers\s.*)'
+    backrefs: yes
+    line: '#\1 # commented by Ansible'
+    backup: yes
+  notify:
+    - reload nginx
+    - supervisorctl restart nginx
+
 - name: Generate strong Diffie-Hellman group
   command: openssl dhparam -out {{ nginx_ssl_conf_dir }}/dhparams.pem 2048
   args: