#53 initial port 80 proxy

Author: donsizemore

.gitignore

@@ -1 +1,2 @@
-venv
+venv
+.vagrant/

defaults/main.yml

@@ -80,7 +80,7 @@ dataverse:
   srcdir: /tmp/dataverse
   thumbnails: true
   usermgmtkey: burrito
-  version: "4.12"
+  version: 4.12
   wholetale:
     enabled: true
 

tasks/dataverse-apache.yml

@@ -13,6 +13,19 @@
         owner=root group=root mode=0644
   when: ansible_os_family == "RedHat" and
         ansible_distribution_major_version == "7"
+        and apache.ssl.enabled == true
+
+- name: install ssl proxy template
+  template: src=ssl.conf.j2 dest=/etc/httpd/conf.d/ssl.conf
+  when: ansible_os_family == "RedHat" and
+        ansible_distribution_major_version == "7"
+        and apache.ssl.enabled == true
+
+- name: install http proxy
+  template: src=dataverse.conf.j2 dest=/etc/httpd/conf.d/ssl.conf
+  when: ansible_os_family == "RedHat" and
+        ansible_distribution_major_version == "7"
+        and apache.ssl.enabled == false
 
 - name: install proxy error boilerplate
   copy: src=503.html dest=/etc/httpd/conf.d owner=root group=root mode=0644

tasks/dataverse-siteurl.yml renamed to tasks/dataverse-fqdn.yml

@@ -1,10 +1,19 @@
+- name: default to http
+  set_fact:
+    protocol: http
+
+- name: unless ssl is enabled
+  set_fact:
+    protocol: https
+  when: apache.ssl.enabled == true
+
 - name: ansible tasks like variables, not group_vars
   set_fact:
     siteUrl: '{{ dataverse.glassfish.siteurl }}'
 
-- name: if siteUrl not passed, use fqdn. fix protocol and port in proxy branch.
+- name: if siteUrl not passed, use fqdn.
   set_fact:
-    siteUrl: 'http\://{{ ansible_fqdn }}\:8080'
+    siteUrl: '{{ protocol }}\://{{ ansible_fqdn }}'
   when: siteUrl |length < 1
 
 - name: are we in EC2?
@@ -29,14 +38,13 @@
 
 - name: now correct siteUrl
   set_fact:
-    siteUrl: 'http\://{{ public_hostname}}\:8080'
+    siteUrl: '{{ protocol }}\://{{ public_hostname}}'
   when: is_aws_environment
 
 - name: debug siteurl
   debug:
     msg: "siteurl is {{ siteUrl }}"
 
-- name: set siteurl
-  become: yes
-  become_user: "{{ dataverse.glassfish.user }}"
-  shell: '{{ glassfish_dir}}/bin/asadmin create-jvm-options "-Ddataverse.siteUrl={{ siteUrl }}"'
+- name: strip siteurl for servername directives
+  set_fact:
+    servername: "{{ siteUrl | regex_replace('[A-z]*://', '') }}"

tasks/dataverse-install.yml

@@ -35,7 +35,7 @@
   become: yes
   become_user: "{{ dataverse.glassfish.user }}"
   environment:
-    HOST_ADDRESS: "{{ dataverse.service_name }}"
+    HOST_ADDRESS: "{{ servername }}"
     GLASSFISH_ROOT: "{{ glassfish_dir }}"
     GLASSFISH_DOMAIN: "{{ dataverse.glassfish.domain }}"
     FILES_DIR: "{{ dataverse.filesdir }}"
@@ -59,9 +59,6 @@
   become_user: "{{ dataverse.glassfish.user }}"
   shell: "{{ glassfish_dir }}/bin/asadmin set-log-file-format {{ dataverse.glassfish.logformat }}"
 
-- name: determine and set siteUrl
-  include: dataverse-siteurl.yml
-  
 - name: deploy dataverse.war
   become: yes
   become_user: "{{ dataverse.glassfish.user }}"

tasks/dataverse-postinstall.yml

@@ -2,8 +2,10 @@
 
 # dataverse/tasks/dataverse-postinstall.yml
 
-#- name: restart solr
-#  service: name=solr state=restarted
+- name: set siteurl
+  become: yes
+  become_user: "{{ dataverse.glassfish.user }}"
+  shell: '{{ glassfish_dir}}/bin/asadmin create-jvm-options "-Ddataverse.siteUrl={{ siteUrl }}"'
 
 - name: stop glassfish manually (systemd gums up the works)
   become: yes

tasks/dataverse-prereqs.yml

@@ -15,10 +15,14 @@
 
 - name: let's use the closest centos mirror
   file: path=/var/cache/yum/x86_64/7/timedhosts.txt state=absent
+  when: ansible_os_family == "RedHat" and
+        ansible_distribution_major_version == "7"
 
 - name: makecache
   yum:
     update_cache: yes
+  when: ansible_os_family == "RedHat" and
+        ansible_distribution_major_version == "7"
 
 - name: install java-nnn-openjdk and other packages for RedHat/CentOS.
   yum:

tasks/main.yml

@@ -4,6 +4,9 @@
 - include: dataverse-prereqs.yml
   tags: prereqs
 
+- include: dataverse-fqdn.yml
+  tags: prereqs
+
 - include: dataverse-apache.yml
   tags: apache
 

templates/dataverse.conf.j2

@@ -0,0 +1,9 @@
+<VirtualHost *:80>
+
+  ServerName '{{ servername }}'
+
+  # for DDI Explorer
+  Header set Access-Control-Allow-Origin "*"
+
+  ProxyPass / ajp://localhost:8009/
+</VirtualHost>

templates/default.config.j2

@@ -1,6 +1,6 @@
 ADMIN_EMAIL	 	{{ dataverse.service_email }}
 GLASSFISH_DIRECTORY	{{ glassfish_dir }}
-HOST_DNS_ADDRESS	{{ dataverse.service_name }}
+HOST_DNS_ADDRESS	{{ servername }}
 MAIL_SERVER		{{ dataverse.smtp }}
 POSTGRES_ADMIN_PASSWORD	{{ dataverse.db.admin_pass }}
 POSTGRES_SERVER		{{ dataverse.db.host }}