From 0e23f54b93c1df4cd60de2d4be8244e13a04b9b6 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 9 May 2017 14:24:18 +0200 Subject: [PATCH] library/roles/geonetwork/geonetwork: The config file is now a template. The gcube personalizations are now handled by a separate role. --- geonetwork/geonetwork/defaults/main.yml | 2 - geonetwork/geonetwork/tasks/main.yml | 9 +- .../templates/geonetwork_config.xml.j2 | 1275 +++++++++++++++++ 3 files changed, 1277 insertions(+), 9 deletions(-) create mode 100644 geonetwork/geonetwork/templates/geonetwork_config.xml.j2 diff --git a/geonetwork/geonetwork/defaults/main.yml b/geonetwork/geonetwork/defaults/main.yml index b44afb57..ba342997 100644 --- a/geonetwork/geonetwork/defaults/main.yml +++ b/geonetwork/geonetwork/defaults/main.yml @@ -10,5 +10,3 @@ geonetwork_download_url: 'https://downloads.sourceforge.net/project/geonetwork/G geonetwork_download_directory: /srv/geonetwork geonetwork_data_directory: /srv/geonetwork_data -geonetwork_cubeapp_url: 'https://data.d4science.org/WmEwY1NwZnJ5NUtoUVBUV0w3NlBFdGEvemdvV3lUY1dHbWJQNStIS0N6Yz0' -geonetwork_configxml_url: 'https://data.d4science.org/RGlieWNEaVRDTUdoUVBUV0w3NlBFZ0Uwc2RqRm1zM05HbWJQNStIS0N6Yz0' diff --git a/geonetwork/geonetwork/tasks/main.yml b/geonetwork/geonetwork/tasks/main.yml index cfe7fe5e..8b1e3bca 100644 --- a/geonetwork/geonetwork/tasks/main.yml +++ b/geonetwork/geonetwork/tasks/main.yml @@ -31,13 +31,8 @@ with_items: '{{ tomcat_m_instances }}' notify: tomcat instances restart - - name: Install the gcubeapps configuration - get_url: url={{ geonetwork_cubeapp_url }} dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name }}/WEB-INF/gcube-app.xml - with_items: '{{ tomcat_m_instances }}' - notify: tomcat instances restart - - - name: Configure geonetwork - get_url: url={{ geonetwork_configxml_url }} dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name }}/WEB-INF/config.xml + - name: Configure geonetwork using our template + template: src=geonetwork_config.xml.j2 dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name }}/WEB-INF/config.xml with_items: '{{ tomcat_m_instances }}' notify: tomcat instances restart diff --git a/geonetwork/geonetwork/templates/geonetwork_config.xml.j2 b/geonetwork/geonetwork/templates/geonetwork_config.xml.j2 new file mode 100644 index 00000000..2c676fa9 --- /dev/null +++ b/geonetwork/geonetwork/templates/geonetwork_config.xml.j2 @@ -0,0 +1,1275 @@ + + + + + + user-profiles.xml + ../../data/tmp + 100 + true + + + + + + main.home + en + true + text/html; charset=UTF-8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + main-db + jeeves.resources.dbms.DbmsPool + + BayACrsQ + Qf7Po9T0 + com.mckoi.JDBCDriver + jdbc:mckoi://localhost:9157/ + 10 + + + + WEB-INF/db/db.conf + + + + + + + main-db + jeeves.resources.dbms.DbmsPool + + admin + admin + com.mysql.jdbc.Driver + jdbc:mysql://$WEBSERVER_HOST/geonetwork + 10 + 3600 + + + + + + + + + main-db + jeeves.resources.dbms.DbmsPool + + admin + admin + oracle.jdbc.driver.OracleDriver + jdbc:oracle:thin:@IP:1521:fs + 10 + + + + + + + + + + main-db + jeeves.resources.dbms.DbmsPool + + {{ geonetwork_db_user }} + {{ geonetwork_db_pwd }} + org.postgresql.Driver + jdbc:postgis://geonetwork_db_hostname:5432/{{ geonetwork_db_name }} + 40 + + + + + + + + + + main-db + jeeves.resources.dbms.DbmsPool + + www-data + www-data + com.microsoft.sqlserver.jdbc.SQLServerDriver + jdbc:sqlserver://SERVER;database=geonetwork;integratedSecurity=false; + 10 + + + + + + + + + + + + + + + + + + + + + + + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-metadata.xml + config-harvesting.xml + config-portal.xml + config-export.xml + config-test.xml + config-csw.xml + config-sru.xml + + + +