Update to run on Ubuntu 20.04 and Tomcat 9

README.md

@@ -18,12 +18,12 @@ fcrepo_version: 5.1.0
 
 User with permissions to install:
 ```
-fcrepo_user: {{ tomcat8_server_user }}
+fcrepo_user: {{ tomcat9_server_user }}
 ```
 
 Path to put Fedora data directory (see the notes section below)
 ```
-fcrepo_data_dir: /var/lib/tomcat8/fcrepo4-data
+fcrepo_data_dir: /var/lib/tomcat9/fcrepo4-data
 ```
 
 A home directory for Fedora
@@ -33,7 +33,7 @@ fcrepo_home_dir: /opt/fcrepo
 
 Where to put the Fedora war file
 ```
-fcrepo_war_path: "{{ tomcat8_home }}/webapps/fcrepo.war"
+fcrepo_war_path: "{{ tomcat9_home }}/webapps/fcrepo.war"
 ```
 
 The activemq configuration file template name

defaults/main.yml

@@ -1,8 +1,8 @@
 fcrepo_version: 5.1.0
-fcrepo_user: "{{ tomcat8_server_user }}"
-fcrepo_data_dir: /var/lib/tomcat8/fcrepo4-data
+fcrepo_user: "{{ tomcat9_server_user }}"
+fcrepo_data_dir: /var/lib/tomcat9/fcrepo4-data
 fcrepo_binary_directory: "{{ fcrepo_data_dir}}/binaries"
-fcrepo_war_path: "{{ tomcat8_home }}/webapps/fcrepo.war"
+fcrepo_war_path: "{{ tomcat9_home }}/webapps/fcrepo.war"
 fcrepo_home_dir: /opt/fcrepo
 fcrepo_activemq_template: activemq.xml.j2
 fcrepo_activemq_broker_url: "tcp://localhost:61616"

tasks/config.yml

@@ -7,23 +7,23 @@
   with_items:
     - claw.cnd
     - fcrepo-config.xml
-  notify: restart tomcat8
+  notify: restart tomcat9
 
 - name: Copy templated repository.json
   template:
     src: "{{ fcrepo_persistence }}-repository.json"
     dest: "{{ fcrepo_home_dir }}/configs/repository.json"
     owner: "{{ fcrepo_user }}"
     group: "{{ fcrepo_user }}"
-  notify: restart tomcat8
+  notify: restart tomcat9
 
 - name: Copy fedora activemq configuration
   template:
     src: "{{ fcrepo_activemq_template }}"
     dest: "{{ fcrepo_config_dir }}/activemq.xml"
     owner: "{{ fcrepo_user }}"
     group: "{{ fcrepo_user }}"
-  notify: restart tomcat8
+  notify: restart tomcat9
 
 # ADDED by dbernstein
 - name: Template out allowed external content paths
@@ -32,4 +32,4 @@
     dest: "{{ fcrepo_allowed_external_content_file }}"
     owner: "{{ fcrepo_user }}"
     group: "{{ fcrepo_user }}"
-  notify: restart tomcat8
+  notify: restart tomcat9

tasks/install.yml

@@ -42,8 +42,8 @@
 - name: Install python dependencies
   apt:
     pkg:
-      - python-psycopg2
-      - python-mysqldb
+      - python3-psycopg2
+      - python3-mysqldb
       - mysql-client 
     state: present
     update_cache: yes