Merge pull request IQSS#165 from GlobalDataverseCommunityConsortium/1…

…62_redirect_template

correct HTTP redirect template for both RHEL/Debian cases

tasks/dataverse-apache-ssl.yml

@@ -63,8 +63,12 @@
   notify: enable and restart apache
 
 - name: install http redirect template
-  template: src=http.redirect.conf.j2 dest="{{ apache_virtualhost_dir }}/http.redirect.conf"
-        owner=root group=root mode=0644
+  template:
+    src: http.redirect.conf.j2
+    dest: '{{ apache_virtualhost_dir }}/http.redirect.conf'
+    owner: root
+    group: root
+    mode: 0644
   when: apache.ssl.enabled
   notify: enable and restart apache
 
@@ -87,7 +91,8 @@
     name: "{{ item }}"
     ignore_configcheck: true
   with_items:
-    - ssl
+    - redirect
     - rewrite
+    - ssl
   when: ansible_os_family == "Debian"    ## CHECKME -- does this need to be Debian-specific?
   notify: enable and restart apache

templates/http.redirect.conf.j2

@@ -2,10 +2,8 @@
 
   ServerName {{ servername }}
 
-  <IfModule mod_rewrite>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-  </IfModule>
+  RewriteEngine On
+  RewriteCond %{HTTPS} !=on
+  RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 </VirtualHost>