diff --git a/gcube/authorization_service/defaults/main.yml b/gcube/authorization_service/defaults/main.yml deleted file mode 100644 index 138ed740..00000000 --- a/gcube/authorization_service/defaults/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -authorization_service_install: False -authorization_service_upgrade: False -authorization_service_name: authorization-service -#authorization_service_file: '{{ authorization_service_name }}-2.0.0-20160927.120833-1.war' -#authorization_service_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots/org/gcube/common/authorization-service/2.0.0-SNAPSHOT/{{ authorization_service_file }}' -authorization_service_file: '{{ authorization_service_name }}-2.0.2-4.11.0-164657.war' -authorization_service_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/org/gcube/common/authorization-service/2.0.2-4.11.0-164657/{{ authorization_service_file }}' -authorization_service_persistence_dest: WEB-INF/classes/META-INF/persistence.xml -authorization_service_config_dest: WEB-INF/AuthorizationConfiguration.xml -auth_user: '{{ d4science_user }}' -authorization_service_loglevel: INFO -authorization_service_root_loglevel: WARN -authorization_service_http_port: 8080 -authorized_ips: - - 127.0.0.1 - diff --git a/gcube/authorization_service/handlers/main.yml b/gcube/authorization_service/handlers/main.yml deleted file mode 100644 index 6a7cdff6..00000000 --- a/gcube/authorization_service/handlers/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Restart the authorization service - service: name='tomcat-instance-{{ authorization_service_http_port }}' state=restarted - when: authorization_service_install - -- name: Stop the authorization service - service: name='tomcat-instance-{{ authorization_service_http_port }}' state=stopped - -- name: Start the authorization service - service: name='tomcat-instance-{{ authorization_service_http_port }}' state=started - when: authorization_service_install diff --git a/gcube/authorization_service/meta/main.yml b/gcube/authorization_service/meta/main.yml deleted file mode 100644 index ca19ed7e..00000000 --- a/gcube/authorization_service/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - ../../library/roles/tomcat-multiple-instances - - ../../library/roles/nginx diff --git a/gcube/authorization_service/tasks/main.yml b/gcube/authorization_service/tasks/main.yml deleted file mode 100644 index bdc67e3f..00000000 --- a/gcube/authorization_service/tasks/main.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -- block: - - name: Stop the service when upgrading - #service: name='tomcat-instance-{{ authorization_http_port }}' state=stopped - service: name=tomcat-instance-8080 state=stopped - when: authorization_service_upgrade - - - name: Remove the installed authorization service before upgrading - file: dest={{ item }} state=absent - with_items: - - '{{ auth_instance_path }}/webapps/authorization-service' - - '{{ auth_instance_path }}/webapps/authorization-service.war' - when: authorization_service_upgrade or not authorization_service_install - - # - name: Get the authorization service war file - # get_url: url={{ authorization_service_url }} dest={{ auth_instance_path }}/webapps/{{ authorization_service_file }} - - # - name: Unpack the authorization service war file - # shell: mkdir {{ auth_instance_path }}/webapps/authorization-service ; cd {{ auth_instance_path }}/webapps/authorization-service ; jar xf {{ auth_instance_path }}/webapps/{{ authorization_service_file }} - # args: - # creates: '{{ auth_instance_path }}/webapps/authorization-service/WEB-INF/AuthorizationConfiguration.xml' - - - name: Create the authorization service webapp directory - file: dest={{ auth_instance_path }}/webapps/authorization-service state=directory - - - name: Get and unpack the authorization war file - unarchive: copy=no src={{ authorization_service_url }} dest={{ auth_instance_path }}/webapps/authorization-service - args: - creates: '{{ auth_instance_path }}/webapps/authorization-service/WEB-INF/AuthorizationConfiguration.xml' - - - name: Install the authorization service AuthorizationConfiguration.xml template - template: src=AuthorizationConfiguration.xml.j2 dest={{ auth_instance_path }}/webapps/authorization-service/{{ authorization_service_config_dest }} mode=0440 - notify: Restart the authorization service - tags: [ 'authorization_service', 'authorization_service_conf', 'tomcat' ] - - - name: Install the authorization service persistence.xml template - template: src=persistence.xml.j2 dest={{ auth_instance_path }}/webapps/authorization-service/{{ authorization_service_persistence_dest }} mode=0440 - notify: Restart the authorization service - tags: [ 'authorization_service', 'authorization_service_conf', 'tomcat' ] - - - name: Install the logback configuration - template: src=logback.xml.j2 dest={{ auth_instance_path }}/lib/logback.xml mode=0644 - notify: Restart the authorization service - - become: True - become_user: '{{ auth_user }}' - when: authorization_service_install - tags: [ 'authorization_service', 'tomcat' ] diff --git a/gcube/authorization_service/templates/AuthorizationConfiguration.xml.j2 b/gcube/authorization_service/templates/AuthorizationConfiguration.xml.j2 deleted file mode 100644 index e4c6f65e..00000000 --- a/gcube/authorization_service/templates/AuthorizationConfiguration.xml.j2 +++ /dev/null @@ -1,26 +0,0 @@ - - - - {% for ip in authorized_ips %} - - {% endfor %} - - - - - {% for ip in authorized_ips %} - - {% endfor %} - - - - - -{% if authorized_ips is defined %} - {% for ip in authorized_ips %} - - {% endfor %} -{% endif %} - - - diff --git a/gcube/authorization_service/templates/logback.xml.j2 b/gcube/authorization_service/templates/logback.xml.j2 deleted file mode 100644 index c405cf2b..00000000 --- a/gcube/authorization_service/templates/logback.xml.j2 +++ /dev/null @@ -1,24 +0,0 @@ - - - - - ${catalina.base}/logs/ghn.log - true - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - - - - ${catalina.base}/logs/ghn.%d{yyyy-MM-dd}.log - 30 - - - - - - - - - - - diff --git a/gcube/authorization_service/templates/persistence.xml.j2 b/gcube/authorization_service/templates/persistence.xml.j2 deleted file mode 100644 index 3ad39bc0..00000000 --- a/gcube/authorization_service/templates/persistence.xml.j2 +++ /dev/null @@ -1,33 +0,0 @@ - - - - - org.eclipse.persistence.jpa.PersistenceProvider - - - org.gcube.common.authorizationservice.persistence.entities.converters.StringListConverter - - - - org.gcube.common.authorizationservice.persistence.entities.AuthorizationEntity - org.gcube.common.authorizationservice.persistence.entities.ServiceAuthorizationEntity - org.gcube.common.authorizationservice.persistence.entities.UserAuthorizationEntity - org.gcube.common.authorizationservice.persistence.entities.ExternalServiceAuthorizationEntity - org.gcube.common.authorizationservice.persistence.entities.NodeAuthorizationEntity - org.gcube.common.authorizationservice.persistence.entities.PolicyEntity - org.gcube.common.authorizationservice.persistence.entities.ServicePolicyEntity - org.gcube.common.authorizationservice.persistence.entities.UserPolicyEntity - - - - - - - - - - diff --git a/ghn-gcore/gcore-base/defaults/main.yml b/ghn-gcore/gcore-base/defaults/main.yml deleted file mode 100644 index f9d26cfe..00000000 --- a/ghn-gcore/gcore-base/defaults/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -repo: "gcube-staging" -#ghn_distribution_version: "7.0.0-4.2.1-132334" -ghn_distribution_bundle_version: "7.0.0-4.2.1-132334" - -#### this gets the latest version in the specified repo -#globus_url: "http://maven.research-infrastructures.eu/nexus/service/local/artifact/maven/redirect?r={{ repo }}&g=org/gcube/distribution&a=ghn-distribution&v=LATEST&e=tar.gz" - -#### this is for the ghn-distribution-bundle -#globus_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/ghn-distribution-bundle/{{ ghn_distribution_bundle_version }}/ghn-distribution-bundle-{{ ghn_distribution_bundle_version }}-bundle.tar.gz" - -globus_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/ghn-distribution/{{ ghn_distribution_bundle_version }}/ghn-distribution-{{ ghn_distribution_bundle_version }}.tar.gz" -ant_url: 'http://archive.apache.org/dist/ant/binaries/apache-ant-1.6.5-bin.tar.gz' - -ghn_user: 'gCore' -globus_location: "/opt/{{ ghn_user }}" -ant_location: '/opt/ant/' - -ghn_port: 8080 -ghn_hostname: "{{ ansible_hostname }}" -ghn_published_host: "{{ ghn_hostname }}:{{ ghn_port }}" - -gcube_key: 'd4s.gcubekey' -servicemap_xmlfile: 'ServiceMap_d4s.xml' -servicemap_endpoint: "{{ ghn_published_host }}" - -common_scope_maps_file: "common-scope-maps-1.0.4-4.2.0-128425-patched.jar" -patch_common_scope: 0 diff --git a/ghn-gcore/gcore-base/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar b/ghn-gcore/gcore-base/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar deleted file mode 100644 index 15c2afdd..00000000 Binary files a/ghn-gcore/gcore-base/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar and /dev/null differ diff --git a/ghn-gcore/gcore-base/files/d4s.gcubekey b/ghn-gcore/gcore-base/files/d4s.gcubekey deleted file mode 100644 index a236e5ae..00000000 --- a/ghn-gcore/gcore-base/files/d4s.gcubekey +++ /dev/null @@ -1 +0,0 @@ -B2$ \ No newline at end of file diff --git a/ghn-gcore/gcore-base/meta/main.yml b/ghn-gcore/gcore-base/meta/main.yml deleted file mode 100644 index 7598753b..00000000 --- a/ghn-gcore/gcore-base/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: java-17 diff --git a/ghn-gcore/gcore-base/tasks/main.yml b/ghn-gcore/gcore-base/tasks/main.yml deleted file mode 100644 index e3782a22..00000000 --- a/ghn-gcore/gcore-base/tasks/main.yml +++ /dev/null @@ -1,66 +0,0 @@ -- name: add ghn user #home is /opt/ghn/, password is "gCore??" - action: user name={{ ghn_user }} password=$1$SuG4r$6AGiUoMKjZAHFJgYLDTkW/ shell=/bin/bash createhome=yes home={{ globus_location }} - -- name: download and extract ghn release specified in '../defaults/main.yml' - unarchive: src='{{ globus_url }}' dest="{{ globus_location }}" copy=no extra_opts='--strip-components=1' - #unarchive: src='{{ globus_url }}' dest="{{ globus_location }}" copy=no extra_opts='--show-stored-names --strip-components=1' - #unarchive: src='http://dl.uxnr.de/mirror/curl/curl-7.52.1.tar.gz' dest="{{ globus_location }}" copy=no - -- name: Test if ant is already deployed - raw: ls -d {{ ant_location }} - register: is_ant_deployed - ignore_errors: True - tags: - - ant - -- name: create ant_location as defined in '../defaults/main.yml' - file: path={{ ant_location }} state=directory owner=root group=root mode=0755 - when: is_ant_deployed.rc != 0 - tags: - - ant - -- name: install apache ant - unarchive: src={{ ant_url }} dest={{ ant_location }} copy=no extra_opts='--strip-components=1' - #unarchive: src={{ ant_url }} dest={{ ant_location }} copy=no extra_opts='--show-stored-names --strip-components=1' - when: is_ant_deployed.rc != 0 - tags: - - ant - -- name: upload the gcube key specified in '../defaults/main.yml' - copy: src={{ gcube_key }} dest={{ globus_location }}/config/ mode=0600 - -- name: upload ghn start script - template: src=gcore-start.sh dest={{ globus_location }} mode=0700 - -- name: copy custom servicemap files - template: src=ServiceMap_d4s.xml dest={{ globus_location }}/config/ - when: patch_common_scope != 0 - -- name: copy custom servicemap files - template: src=ServiceMap_d4stesting.xml dest={{ globus_location }}/config/ - when: patch_common_scope != 0 - -- name: patch_common_scope={{ patch_common_scope }}, removing bundled common-scope-maps - raw: rm -f {{ globus_location }}/lib/common-scope-maps* - when: patch_common_scope != 0 - ignore_errors: True - tags: - - common_scope_maps - -- name: upload patched common-scope-maps - copy: src={{ common_scope_maps_file }} dest={{ globus_location }}/lib/ owner={{ ghn_user }} group={{ ghn_user }} mode=0644 - when: patch_common_scope != 0 - tags: - - common_scope_maps - -- name: upload d4s.authorization - template: src=d4s.authorization dest={{ globus_location }}/config/ mode=0644 - -- name: restore ownership - file: dest={{ globus_location }} owner={{ ghn_user }} group={{ ghn_user }} recurse=yes - -# this is commented out since at this point no service has been deployed yet -#- name: start the container -# become: yes -# become_user: "{{ ghn_user }}" -# command: "{{ globus_location }}/gcore-start.sh" diff --git a/ghn-gcore/gcore-base/templates/ServiceMap_d4s.xml b/ghn-gcore/gcore-base/templates/ServiceMap_d4s.xml deleted file mode 100644 index 0376feaa..00000000 --- a/ghn-gcore/gcore-base/templates/ServiceMap_d4s.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/ghn-gcore/gcore-base/templates/ServiceMap_d4stesting.xml b/ghn-gcore/gcore-base/templates/ServiceMap_d4stesting.xml deleted file mode 100644 index 79f604c6..00000000 --- a/ghn-gcore/gcore-base/templates/ServiceMap_d4stesting.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/ghn-gcore/gcore-base/templates/bashrc.j2 b/ghn-gcore/gcore-base/templates/bashrc.j2 deleted file mode 100644 index ccd0f248..00000000 --- a/ghn-gcore/gcore-base/templates/bashrc.j2 +++ /dev/null @@ -1 +0,0 @@ -# example: registry={{ COMMON_NPM_MIRROR_URL }} diff --git a/ghn-gcore/gcore-base/templates/d4s.authorization b/ghn-gcore/gcore-base/templates/d4s.authorization deleted file mode 100644 index 7e75ea64..00000000 --- a/ghn-gcore/gcore-base/templates/d4s.authorization +++ /dev/null @@ -1 +0,0 @@ -{{ authorization_hostname }}false{{ authorization_port }} diff --git a/ghn-gcore/gcore-base/templates/gcore-start.sh b/ghn-gcore/gcore-base/templates/gcore-start.sh deleted file mode 100755 index 60f59396..00000000 --- a/ghn-gcore/gcore-base/templates/gcore-start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -export GLOBUS_LOCATION={{ globus_location }} -export PATH=$PATH:$GLOBUS_LOCATION/bin -export ANT_HOME={{ ant_location }} - -nohup {{ globus_location }}/bin/gcore-start-container -p {{ ghn_port }} diff --git a/ghn-gcore/gcore-collector/defaults/main.yml b/ghn-gcore/gcore-collector/defaults/main.yml deleted file mode 100644 index 0db9f9d8..00000000 --- a/ghn-gcore/gcore-collector/defaults/main.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# recent versions of eXist setup do not allow for a quiet installation, therefore we switch to the -# last known working version -#exist_url: 'https://bintray.com/existdb/releases/download_file?file_path=eXist-db-setup-2.2.jar' -exist_jar: 'eXist-setup-1.2.6-rev9165.jar' -exist_url: "http://downloads.sourceforge.net/project/exist/Stable/1.2/{{ exist_jar }}" -exist_location: "{{ globus_location }}/exist/" - -repo: "gcube-staging" -#collector_version: "3.0.2-4.1.0-126944" -is_collector_service_version: "3.0.2-4.1.0-126944" -collector_artifact: "is-collector-service-{{ is_collector_service_version }}" -collector_gar: "{{ collector_artifact }}.gar" -collector_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/informationsystem/is-collector-service/{{ is_collector_service_version }}/{{ collector_gar }}" - -collector_hostname: "d4s.res.eng.it" -collector_port: "8099" -collector_endpoint: "{{ collector_hostname }}:{{ collector_port }}" - -start_scopes: '' -infrastructure: 'd4s' diff --git a/ghn-gcore/gcore-collector/meta/main.yml.bckp b/ghn-gcore/gcore-collector/meta/main.yml.bckp deleted file mode 100644 index 69d1e2cc..00000000 --- a/ghn-gcore/gcore-collector/meta/main.yml.bckp +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: gcore-base diff --git a/ghn-gcore/gcore-collector/tasks/main.yml b/ghn-gcore/gcore-collector/tasks/main.yml deleted file mode 100644 index 2d861a3c..00000000 --- a/ghn-gcore/gcore-collector/tasks/main.yml +++ /dev/null @@ -1,73 +0,0 @@ -- name: download eXist DB - get_url: url={{ exist_url }} dest=/tmp force=yes - -- name: create exist_location as defined in '../defaults/main.yml' - file: path={{ exist_location }} state=directory owner={{ ghn_user }} group={{ ghn_user }} mode=0755 - -- name: install eXist DB - command: "java -jar /tmp/{{ exist_jar }} -p {{ exist_location }}" - -- name: remove eXist setup jar - file: path="/tmp/{{ exist_jar }}" state=absent - -- name: add the EXIST_HOME parameter to the gcore startup script - lineinfile: dest="{{ globus_location }}/gcore-start.sh" insertafter="^export ANT_HOME" state=present line="export EXIST_HOME={{ exist_location }}" - -# remotely using with_fileglob seems to give all sorts of issues -# while using copy module is out of question since it's not -# capable of using wildcards, hence we'll use the shell module -# when there's a need to use wildcards in filenames -#- name: copy exist libs in "{{ globus_location }}/lib/" -# copy: src={{ item }} dest="{{ globus_location }}/lib/" remote_src=true -# with_fileglob: -# - "{{ exist_location}}/exist.jar" -# - "{{ exist_location}}/lib/core/quartz-*.jar" -# - "{{ exist_location}}/lib/core/xmlrpc-*" -# - "{{ exist_location}}/lib/core/xmldb.jar" -# - "{{ exist_location}}/lib/core/jta.jar" -# - "{{ exist_location}}/lib/core/commons-pool-*.jar" - -- name: copy exist.jar in $GLOBUS_LOCATION/lib - copy: src="{{ exist_location}}/exist.jar" dest="{{ globus_location }}/lib/" remote_src=true - -- name: copy quartz jar in $GLOBUS_LOCATION/lib - shell: cp -R {{ exist_location}}/lib/core/quartz-*.jar {{ globus_location }}/lib/ - -- name: copy xmlrpc-* in $GLOBUS_LOCATION/lib - shell: cp -R {{ exist_location}}/lib/core/xmlrpc-* {{ globus_location }}/lib/ - -- name: copy xmldb in $GLOBUS_LOCATION/lib - copy: src="{{ exist_location}}/lib/core/xmldb.jar" dest="{{ globus_location }}/lib/" remote_src=true - -- name: copy jta.jar in $GLOBUS_LOCATION/lib - copy: src="{{ exist_location}}/lib/core/jta.jar" dest="{{ globus_location }}/lib/" remote_src=true - -- name: copy commons-pool-*.jar in $GLOBUS_LOCATION/lib - shell: cp -R {{ exist_location}}/lib/core/commons-pool-*.jar {{ globus_location }}/lib/ - -- name: download is-collector-service.gar - get_url: url={{ collector_url }} dest=/tmp force=yes - -- name: deploy is-collector-service.gar - shell: export GLOBUS_LOCATION={{ globus_location }} ANT_HOME={{ ant_location }} && {{ globus_location }}/bin/gcore-deploy-service /tmp/{{ collector_gar }} - -- name: add GLOBUS_OPTIONS to the gcore startup script - lineinfile: dest="{{ globus_location }}/gcore-start.sh" insertafter="^export EXIST_HOME" state=present line='export GLOBUS_OPTIONS="-Xms512M -Xmx1024M -Dexist.home=$EXIST_HOME"' - -- name: set logicalhost parameter on {{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd - replace: dest="{{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd" regexp='localhost' replace="{{ collector_hostname }}" - -- name: copy updated GHNConfig.xml - template: src=GHNConfig.xml dest={{ globus_location }}/config/ - -- name: updated is-collector-service jndi-config.xml, add start scopes - lineinfile: dest="{{ globus_location }}/etc/{{ collector_artifact }}/jndi-config.xml" insertafter='.*?' state=present line=" " - when: start_scopes != "" - -- name: restore ownership - file: dest={{ globus_location }} owner={{ ghn_user }} group={{ ghn_user }} recurse=yes - -- name: start gCore - become: yes - become_user: "{{ ghn_user }}" - shell: "{{ globus_location }}/gcore-start.sh" diff --git a/ghn-gcore/gcore-collector/templates/GHNConfig.xml b/ghn-gcore/gcore-collector/templates/GHNConfig.xml deleted file mode 100755 index 9fd8f9be..00000000 --- a/ghn-gcore/gcore-collector/templates/GHNConfig.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ghn-gcore/gcore-notifier/defaults/main.yml b/ghn-gcore/gcore-notifier/defaults/main.yml deleted file mode 100644 index 8345344f..00000000 --- a/ghn-gcore/gcore-notifier/defaults/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -repo: "gcube-staging" -notifier_version: "1.4.0-4.1.0-126911" -notifier_artifact: "notifier-service-{{ notifier_version }}" -notifier_gar: "{{ notifier_artifact }}.gar" -notifier_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/informationsystem/notifier-service/{{ notifier_version }}/{{ notifier_gar }}" - -notifier_hostname: "d4s.res.eng.it" -notifier_port: "d4s.res.eng.it" -notifier_endpoint: "{{ notifier_hostname }}:{{ notifier_port }}" - -start_scopes: '' -infrastructure: 'd4s' diff --git a/ghn-gcore/gcore-notifier/meta/main.yml b/ghn-gcore/gcore-notifier/meta/main.yml deleted file mode 100644 index 69d1e2cc..00000000 --- a/ghn-gcore/gcore-notifier/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: gcore-base diff --git a/ghn-gcore/gcore-notifier/tasks/main.yml b/ghn-gcore/gcore-notifier/tasks/main.yml deleted file mode 100644 index 9e8fea11..00000000 --- a/ghn-gcore/gcore-notifier/tasks/main.yml +++ /dev/null @@ -1,26 +0,0 @@ -- name: download {{ notifier_gar }} - get_url: url={{ notifier_url }} dest=/tmp force=yes - -- name: deploy {{ notifier_gar }} - shell: export GLOBUS_LOCATION={{ globus_location }} ANT_HOME={{ ant_location }} && {{ globus_location }}/bin/gcore-deploy-service /tmp/{{ notifier_gar }} - -- name: add GLOBUS_OPTIONS to the gcore startup script - lineinfile: dest="{{ globus_location }}/gcore-start.sh" insertbefore="^nohup" state=present line='export GLOBUS_OPTIONS="-Xms512M -Xmx1024M"' - -- name: copy updated GHNConfig.xml - template: src=GHNConfig.xml dest={{ globus_location }}/config/ - -## despite what the documentation says, seems there's no need to specify starting scopes for the notifier to work correctly -#- name: copy updated notifier-service jndi-config.xml -# template: src=jndi-config.xml dest={{ globus_location }}/etc/{{ notifier_artifact }}/ - -- name: set logicalhost parameter on {{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd - replace: dest="{{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd" regexp='localhost' replace="{{ notifier_hostname }}" - -- name: restore ownership - file: dest={{ globus_location }} owner={{ ghn_user }} group={{ ghn_user }} recurse=yes - -- name: start gCore - become: yes - become_user: "{{ ghn_user }}" - shell: "{{ globus_location }}/gcore-start.sh" diff --git a/ghn-gcore/gcore-notifier/templates/GHNConfig.xml b/ghn-gcore/gcore-notifier/templates/GHNConfig.xml deleted file mode 100755 index 5cab62d4..00000000 --- a/ghn-gcore/gcore-notifier/templates/GHNConfig.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ghn-gcore/gcore-portal/defaults/main.yml b/ghn-gcore/gcore-portal/defaults/main.yml deleted file mode 100644 index 160df6d3..00000000 --- a/ghn-gcore/gcore-portal/defaults/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -repo: "gcube-staging" -portal_version: "4.1.0-4.2.0-133176" -portal_bundle: "gcube-portal-bundle-{{ portal_version }}.tar.gz" -portal_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/gcube-portal-bundle/{{ portal_version }}/{{ portal_bundle }}" - -portal_user: "gCore" -portal_home: "/opt/{{ portal_user }}" - -gcube_key: 'd4s.gcubekey' -tomcat_port: "8080" - -common_scope_maps_file: "common-scope-maps-1.0.4-4.2.0-128425-patched.jar" -patch_common_scope: 0 - -start_scopes: '' -infrastructure: 'd4s' diff --git a/ghn-gcore/gcore-portal/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar b/ghn-gcore/gcore-portal/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar deleted file mode 100644 index 15c2afdd..00000000 Binary files a/ghn-gcore/gcore-portal/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar and /dev/null differ diff --git a/ghn-gcore/gcore-portal/files/d4s.gcubekey b/ghn-gcore/gcore-portal/files/d4s.gcubekey deleted file mode 100644 index a236e5ae..00000000 --- a/ghn-gcore/gcore-portal/files/d4s.gcubekey +++ /dev/null @@ -1 +0,0 @@ -B2$ \ No newline at end of file diff --git a/ghn-gcore/gcore-portal/meta/main.yml b/ghn-gcore/gcore-portal/meta/main.yml deleted file mode 100644 index 7598753b..00000000 --- a/ghn-gcore/gcore-portal/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: java-17 diff --git a/ghn-gcore/gcore-portal/tasks/main.yml b/ghn-gcore/gcore-portal/tasks/main.yml deleted file mode 100644 index 5df4e9ac..00000000 --- a/ghn-gcore/gcore-portal/tasks/main.yml +++ /dev/null @@ -1,69 +0,0 @@ -- name: add portal user #default home is /opt/ghn-portal/, password is "gCore??" - action: user name={{ portal_user }} password=$1$SuG4r$6AGiUoMKjZAHFJgYLDTkW/ shell=/bin/bash createhome=yes home={{ portal_home }} - -- name: download and extract {{ portal_bundle }} as specified in '../defaults/main.yml' - unarchive: src={{ portal_url }} dest={{ portal_home }} copy=no #extra_opts='--show-stored-names --strip-components=1' - -- name: upload the gcube key specified in '../defaults/main.yml' - copy: src={{ gcube_key }} dest="{{ portal_home }}/gCube/keys/" mode=0600 - -- name: retrieve tomcat path - shell: ls -d {{ portal_home }}/tomcat* - register: tomcat_path - -#### since this role deploys from scratch, there's no way to actually patch the common-scope-maps that's -#### deployed from within the resource-management webapp for now, since the very same webapp hasn't been -#### deployed yet -#- name: retrieve resource-management webapp path -# shell: ls -d {{ portal_home }}/tomcat*/webapps/resource-management-*/ -# register: resource_management_path -# ignore_errors: True - -- name: upload configured infrastructure.properties - template: src="infrastructureproperties" dest="{{ tomcat_path.stdout }}/conf/infrastructure.properties" mode=0700 - -- name: updload portal-ext.properties - template: src="portal-ext.properties" dest="{{ tomcat_path.stdout }}/webapps/ROOT/WEB-INF/classes/" - -- name: upload .bashrc to {{ portal_user }} - template: src=bashrc dest="{{ portal_home }}/.bashrc" mode=0644 - -- name: tell tomcat to listen to the tomcat_port variable defined in "../defaults/main.yml" - shell: sed -i "s/8080/{{ tomcat_port }}/g" "{{ tomcat_path.stdout }}/conf/server.xml" - -- name: patch_common_scope enabled, removing bundled common-scope-maps - raw: rm -f {{ portal_home }}/{{ item }}/common-scope-maps* - with_items: - - gCube/lib/_fws - - lib/fws -# - "{{ resource_management_path }}" - when: patch_common_scope != 0 - ignore_errors: True - tags: - - common_scope_maps - -- name: upload patched common-scope-maps - copy: src={{ common_scope_maps_file }} dest={{ portal_home }}/{{ item }}/ owner={{ portal_user }} group={{ portal_user }} mode=0644 - with_items: - - gCube/lib/_fws - - lib/fws -# - "{{ resource_management_path }}" - when: patch_common_scope != 0 - tags: - - common_scope_maps - -- name: upload d4s.authorization - template: src=d4s.authorization dest={{ item }} owner={{ portal_user }} group={{ portal_user }} mode=0644 - with_items: - - "{{ portal_home }}/lib/" - - "{{ portal_home }}/gCube/lib/" - - "{{ tomcat_path.stdout }}/lib/" - - "{{ tomcat_path.stdout }}" - -- name: restore ownership - file: dest={{ portal_home }} owner={{ portal_user }} group={{ portal_user }} recurse=yes - -- name: start the portal - become: yes - become_user: "{{ portal_user }}" - shell: source ~/.bashrc && nohup {{ tomcat_path.stdout }}/bin/startup.sh & diff --git a/ghn-gcore/gcore-portal/templates/bashrc b/ghn-gcore/gcore-portal/templates/bashrc deleted file mode 100644 index 5243d950..00000000 --- a/ghn-gcore/gcore-portal/templates/bashrc +++ /dev/null @@ -1,16 +0,0 @@ -# .bashrc - -# Source global definitions -if [ -f /etc/bashrc ]; then - . /etc/bashrc -fi - -# User specific aliases and functions -export CLASSPATH="" -export CATALINA_HOME="{{ tomcat_path.stdout }}" -export JAVA_HOME="/usr/lib/jvm/jre-1.7.0" -export JRE_HOME="/usr/lib/jvm/jre-1.7.0" -#export CATALINA_OPTS="-DGLOBUS_LOCATION=$GLOBUS_LOCATION -Xmx2048m -Xms2048m -XX:MaxPermSize=256m -Djava.protocol.handler.pkgs=com.sun.net.ssl.internal.www.protocol -Dlog4j.ignoreTCL=true -Dlog4j.configuration=file://$CATALINA_HOME/portal-log4j.properties" -export CATALINA_OPTS="-Dexternal-properties=portal-developer.properties -Xmx1000m -Xms1000m -XX:PermSize=512m -XX:MaxPermSize=512m -Djava.protocol.handler.pkgs=com.sun.net.ssl.internal.www.protocol -Dlog4j.ignoreTCL=true -Dlog4j.configuration=file://$CATALINA_HOME/portal-log4j.properties -Dlogback.configurationFile=file://$CATALINA_HOME/portal-logback.xml" -export CATALINA_PID="{{ portal_home }}/pid.txt" - diff --git a/ghn-gcore/gcore-portal/templates/d4s.authorization b/ghn-gcore/gcore-portal/templates/d4s.authorization deleted file mode 100644 index 7e75ea64..00000000 --- a/ghn-gcore/gcore-portal/templates/d4s.authorization +++ /dev/null @@ -1 +0,0 @@ -{{ authorization_hostname }}false{{ authorization_port }} diff --git a/ghn-gcore/gcore-portal/templates/infrastructureproperties b/ghn-gcore/gcore-portal/templates/infrastructureproperties deleted file mode 100644 index de92b968..00000000 --- a/ghn-gcore/gcore-portal/templates/infrastructureproperties +++ /dev/null @@ -1,9 +0,0 @@ -# DO NOT DELETE THIS FILE -# gCube Infrastructure Properties tells the webapps on which infrastructure they run -# Author: Massimiliano Assante, ISTI-CNR - -# a single infrastructure -infrastructure={{ infrastructure }} - -# multiple scopes must be separated by comma (e.g FARM,gCubeApps) -scopes={{ start_scopes }} diff --git a/ghn-gcore/gcore-portal/templates/portal-ext.properties b/ghn-gcore/gcore-portal/templates/portal-ext.properties deleted file mode 100644 index fd1450cf..00000000 --- a/ghn-gcore/gcore-portal/templates/portal-ext.properties +++ /dev/null @@ -1,2 +0,0 @@ -liferay.home={{ portal_home }} -include-and-override={{ portal_home }}/portal-ext.properties diff --git a/ghn-gcore/gcore-registry/defaults/main.yml b/ghn-gcore/gcore-registry/defaults/main.yml deleted file mode 100644 index 8bfffadd..00000000 --- a/ghn-gcore/gcore-registry/defaults/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -repo: "gcube-staging" -registry_version: "2.1.4-4.1.0-126945" -registry_artifact: "is-registry-service-{{ registry_version }}" -registry_gar: "{{ registry_artifact }}.gar" -registry_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/informationsystem/is-registry-service/{{ registry_version }}/{{ registry_gar }}" - -start_scopes: '' -infrastructure: 'd4s' - -registry_port: '8080' -registry_hostname: "{{ ansible_hostname }}" -registry_published_host: '{{ registry_hostname }}:{{ registry_port }}' diff --git a/ghn-gcore/gcore-registry/meta/main.yml b/ghn-gcore/gcore-registry/meta/main.yml deleted file mode 100644 index b102421b..00000000 --- a/ghn-gcore/gcore-registry/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -#dependencies: -# - role: gcore-base diff --git a/ghn-gcore/gcore-registry/tasks/main.yml b/ghn-gcore/gcore-registry/tasks/main.yml deleted file mode 100644 index 9a1b9381..00000000 --- a/ghn-gcore/gcore-registry/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ -- name: download {{ registry_gar }} - get_url: url={{ registry_url }} dest=/tmp force=yes - -- name: deploy {{ registry_gar }} - shell: export GLOBUS_LOCATION={{ globus_location }} && export ANT_HOME={{ ant_location }} && export PATH=$PATH:$GLOBUS_LOCATION/bin && {{ globus_location }}/bin/gcore-deploy-service /tmp/{{ registry_gar }} - -- name: add GLOBUS_OPTIONS to the gcore startup script - lineinfile: dest="{{ globus_location }}/gcore-start.sh" insertbefore="^nohup" state=present line='export GLOBUS_OPTIONS="-Xms512M -Xmx1024M"' - -- name: copy updated GHNConfig.xml - template: src=GHNConfig.xml dest={{ globus_location }}/config/ - -- name: updated is-registry-service jndi-config.xml, add start scopes when needed - lineinfile: dest="{{ globus_location }}/etc/{{ registry_artifact }}/jndi-config.xml" insertafter='.*?' state=present line=" " - when: start_scopes != "" - -- name: set logicalhost parameter on {{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd - replace: dest="{{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd" regexp='localhost' replace="{{ registry_hostname }}" - -- name: add is-registry Servicemap entry - lineinfile: dest="{{ globus_location }}/config/{{ servicemap_xmlfile }}" insertbefore="^" state=present line=' ' - -- name: restore ownership - file: dest={{ globus_location }} owner={{ ghn_user }} group={{ ghn_user }} recurse=yes - -- name: start gCore - become: yes - become_user: "{{ ghn_user }}" - shell: "{{ globus_location }}/gcore-start.sh" diff --git a/ghn-gcore/gcore-registry/templates/GHNConfig.xml b/ghn-gcore/gcore-registry/templates/GHNConfig.xml deleted file mode 100755 index e80d5584..00000000 --- a/ghn-gcore/gcore-registry/templates/GHNConfig.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ghn-gcore/gcore-resourcebroker/defaults/main.yml b/ghn-gcore/gcore-resourcebroker/defaults/main.yml deleted file mode 100644 index 647954c5..00000000 --- a/ghn-gcore/gcore-resourcebroker/defaults/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -repo: "gcube-staging" -resourcebroker_version: "1.2.0-4.1.0-126927" -resourcebroker_artifact: "resourcebroker-service-{{ resourcebroker_version }}" -resourcebroker_gar: "{{ resourcebroker_artifact }}.gar" -resourcebroker_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/resourcemanagement/resourcebroker-service/{{ resourcebroker_version }}/{{ resourcebroker_gar }}" - -resourcebroker_serialization_version: "1.2.0-4.1.0-126929" -resourcebroker_serialization_artifact: "resourcebroker-serialization-{{ resourcebroker_serialization_version }}" -resourcebroker_serialization_jar: "{{ resourcebroker_serialization_artifact }}.jar" -resourcebroker_serialization_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/resourcemanagement/resourcebroker-serialization/{{ resourcebroker_serialization_version}}/{{ resourcebroker_serialization_jar }}" - -resourcebroker_stubs_version: "1.2.0-4.1.0-126927" -resourcebroker_stubs_artifact: "rbstubs-{{ resourcebroker_stubs_version }}" -resourcebroker_stubs_jar: "{{ resourcebroker_stubs_artifact }}.jar" -resourcebroker_stubs_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/resourcemanagement/rbstubs/{{ resourcebroker_stubs_version }}/{{ resourcebroker_stubs_jar }}" - -resourcebroker_hostname: "d4s.res.eng.it" -resourcebroker_port: "8399" -resourcebroker_endpoint: "{{ resourcebroker_hostname }}:{{ resourcebroker_port }}" - -start_scopes: '' -infrastructure: 'd4s' diff --git a/ghn-gcore/gcore-resourcebroker/meta/main.yml.old b/ghn-gcore/gcore-resourcebroker/meta/main.yml.old deleted file mode 100644 index 69d1e2cc..00000000 --- a/ghn-gcore/gcore-resourcebroker/meta/main.yml.old +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: gcore-base diff --git a/ghn-gcore/gcore-resourcebroker/tasks/main.yml b/ghn-gcore/gcore-resourcebroker/tasks/main.yml deleted file mode 100644 index b86ccf00..00000000 --- a/ghn-gcore/gcore-resourcebroker/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ -- name: download {{ resourcebroker_gar }} - get_url: url={{ resourcebroker_url }} dest=/tmp force=yes - -- name: deploy {{ resourcebroker_gar }} - shell: export GLOBUS_LOCATION={{ globus_location }} ANT_HOME={{ ant_location }} && {{ globus_location }}/bin/gcore-deploy-service /tmp/{{ resourcebroker_gar }} - -- name: add GLOBUS_OPTIONS to the gcore startup script - lineinfile: dest="{{ globus_location }}/gcore-start.sh" insertbefore="^nohup" state=present line='export GLOBUS_OPTIONS="-Xms512M -Xmx1024M"' - -- name: copy updated GHNConfig.xml - template: src=GHNConfig.xml dest={{ globus_location }}/config/ - -#- name: update the resourcebroker jndi-config.xml, add start scopes when needed -# lineinfile: dest="{{ globus_location }}/etc/{{ registry_artifact }}/jndi-config.xml" insertafter='.*?' state=present line=" " - -- name: deploy {{ resourcebroker_serialization_artifact }} - get_url: url={{ resourcebroker_serialization_url }} dest="{{ globus_location }}/lib/" force=yes - -- name: deploy {{ resourcebroker_stubs_artifact }} - get_url: url={{ resourcebroker_stubs_url }} dest="{{ globus_location }}/lib/" force=yes - -- name: set logicalhost parameter on {{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd - replace: dest="{{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd" regexp='localhost' replace="{{ resourcebroker_hostname }}" - -- name: restore ownership - file: dest={{ globus_location }} owner={{ ghn_user }} group={{ ghn_user }} recurse=yes - -- name: start gCore - become: yes - become_user: "{{ ghn_user }}" - shell: "{{ globus_location }}/gcore-start.sh" diff --git a/ghn-gcore/gcore-resourcebroker/templates/GHNConfig.xml b/ghn-gcore/gcore-resourcebroker/templates/GHNConfig.xml deleted file mode 100755 index d23cdb0a..00000000 --- a/ghn-gcore/gcore-resourcebroker/templates/GHNConfig.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ghn-gcore/gcore-resourcemanager/defaults/main.yml b/ghn-gcore/gcore-resourcemanager/defaults/main.yml deleted file mode 100644 index 1c1743fc..00000000 --- a/ghn-gcore/gcore-resourcemanager/defaults/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -repo: "gcube-staging" -resource_manager_version: "2.2.0-4.1.0-132314" -resource_manager_artifact: "resource-manager-service-{{ resource_manager_version }}" -resource_manager_gar: "{{ resource_manager_artifact }}.gar" -resource_manager_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/resourcemanagement/resource-manager-service/{{ resource_manager_version }}/{{ resource_manager_gar}}" - -resourcebroker_serialization_version: "1.2.0-4.1.0-126929" -resourcebroker_serialization_artifact: "resourcebroker-serialization-{{ resourcebroker_serialization_version }}" -resourcebroker_serialization_jar: "{{ resourcebroker_serialization_artifact }}.jar" -resourcebroker_serialization_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/resourcemanagement/resourcebroker-serialization/{{ resourcebroker_serialization_version}}/{{ resourcebroker_serialization_jar }}" - -resourcebroker_stubs_version: "1.2.0-4.1.0-126927" -resourcebroker_stubs_artifact: "rbstubs-{{ resourcebroker_stubs_version }}" -resourcebroker_stubs_jar: "{{ resourcebroker_stubs_artifact }}.jar" -resourcebroker_stubs_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/resourcemanagement/rbstubs/{{ resourcebroker_stubs_version }}/{{ resourcebroker_stubs_jar }}" - -resource_manager_hostname: "d4s.res.eng.it" -resource_manager_port: "8499" -resource_manager_endpoint: "{{ resource_manager_hostname }}:{{ resource_manager_port }}" - -start_scopes: '' -infrastructure: 'd4s' diff --git a/ghn-gcore/gcore-resourcemanager/meta/main.yml b/ghn-gcore/gcore-resourcemanager/meta/main.yml deleted file mode 100644 index 69d1e2cc..00000000 --- a/ghn-gcore/gcore-resourcemanager/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: gcore-base diff --git a/ghn-gcore/gcore-resourcemanager/tasks/main.yml b/ghn-gcore/gcore-resourcemanager/tasks/main.yml deleted file mode 100644 index 0a3a9d6d..00000000 --- a/ghn-gcore/gcore-resourcemanager/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ -- name: download {{ resource_manager_gar }} - get_url: url={{ resource_manager_url }} dest=/tmp force=yes - -- name: deploy {{ resource_manager_gar }} - shell: export GLOBUS_LOCATION={{ globus_location }} ANT_HOME={{ ant_location }} && {{ globus_location }}/bin/gcore-deploy-service /tmp/{{ resource_manager_gar }} - -- name: add GLOBUS_OPTIONS to the gcore startup script - lineinfile: dest="{{ globus_location }}/gcore-start.sh" insertbefore="^nohup" state=present line='export GLOBUS_OPTIONS="-Xms512M -Xmx1024M"' - -- name: copy updated GHNConfig.xml - template: src=GHNConfig.xml dest={{ globus_location }}/config/ - -#- name: copy updated resource-manager jndi-config.xml -# template: src=jndi-config.xml dest={{ globus_location }}/etc/{{ resource_manager_artifact }}/ - -- name: set logicalhost parameter on {{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd - replace: dest="{{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd" regexp='localhost' replace="{{ resource_manager_hostname }}" - -- name: deploy {{ resourcebroker_serialization_artifact }} - get_url: url={{ resourcebroker_serialization_url }} dest="{{ globus_location }}/lib/" force=yes - -- name: deploy {{ resourcebroker_stubs_artifact }} - get_url: url={{ resourcebroker_stubs_url }} dest="{{ globus_location }}/lib/" force=yes - -- name: restore ownership - file: dest={{ globus_location }} owner={{ ghn_user }} group={{ ghn_user }} recurse=yes - -- name: start gCore - become: yes - become_user: "{{ ghn_user }}" - shell: "{{ globus_location }}/gcore-start.sh" diff --git a/ghn-gcore/gcore-resourcemanager/templates/GHNConfig.xml b/ghn-gcore/gcore-resourcemanager/templates/GHNConfig.xml deleted file mode 100755 index f53384cf..00000000 --- a/ghn-gcore/gcore-resourcemanager/templates/GHNConfig.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ghn-gcore/gcore-softwaregateway/defaults/main.yml b/ghn-gcore/gcore-softwaregateway/defaults/main.yml deleted file mode 100644 index 1e9fcc64..00000000 --- a/ghn-gcore/gcore-softwaregateway/defaults/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -repo: "gcube-staging" -software_gateway_version: "1.1.6-4.1.0-126706" -software_gateway_artifact: "softwaregateway-service-{{ software_gateway_version }}" -software_gateway_gar: "{{ software_gateway_artifact }}.gar" -software_gateway_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/resourcemanagement/softwaregateway-service/{{ software_gateway_version }}/{{ software_gateway_gar }}" - -software_gateway_hostname: "d4s.res.eng.it" -software_gateway_port: "8599" -software_gateway_endpoint: "{{ software_gateway_hostname }}:{{ software_gateway_port }}" - -start_scopes: '' -infrastructure: 'd4s' diff --git a/ghn-gcore/gcore-softwaregateway/files/settings.xml b/ghn-gcore/gcore-softwaregateway/files/settings.xml deleted file mode 100644 index 28d09bf9..00000000 --- a/ghn-gcore/gcore-softwaregateway/files/settings.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - gcube-snapshots - gcube-user - maven - - - gcube-releases - gcube-user - maven - - - - - - gcube - - - gcube-staging - gCube Staging - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging - - false - - - true - - - - gcube-externals - gCube Externals - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals - - false - - - true - - - - - - gcube-releases - gCube Releases - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases - - false - - - true - - - - - - - gcube - - diff --git a/ghn-gcore/gcore-softwaregateway/meta/main.yml b/ghn-gcore/gcore-softwaregateway/meta/main.yml deleted file mode 100644 index 69d1e2cc..00000000 --- a/ghn-gcore/gcore-softwaregateway/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: gcore-base diff --git a/ghn-gcore/gcore-softwaregateway/tasks/main.yml b/ghn-gcore/gcore-softwaregateway/tasks/main.yml deleted file mode 100644 index 5cf61566..00000000 --- a/ghn-gcore/gcore-softwaregateway/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ -- name: download {{ software_gateway_gar }} - get_url: url={{ software_gateway_url }} dest=/tmp force=yes - -- name: deploy {{ software_gateway_gar }} - shell: export GLOBUS_LOCATION={{ globus_location }} ANT_HOME={{ ant_location }} && {{ globus_location }}/bin/gcore-deploy-service /tmp/{{ software_gateway_gar }} - -- name: add GLOBUS_OPTIONS to the gcore startup script - lineinfile: dest="{{ globus_location }}/gcore-start.sh" insertbefore="^nohup" state=present line='export GLOBUS_OPTIONS="-Xms512M -Xmx1024M"' - -- name: copy updated GHNConfig.xml - template: src=GHNConfig.xml dest={{ globus_location }}/config/ - -- name: copy settings.xml as per "https://gcube.wiki.gcube-system.org/gcube/Talk:Creating_gCube_Maven_components:_How-To#Repositories" - copy: src=settings.xml dest={{ globus_location }}/etc/{{ software_gateway_artifact }}/ - -- name: set logicalhost parameter on {{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd - replace: dest="{{ globus_location }}/etc/globus_wsrf_core/server-config.wsdd" regexp='localhost' replace="{{ software_gateway_hostname }}" - -- name: restore ownership - file: dest={{ globus_location }} owner={{ ghn_user }} group={{ ghn_user }} recurse=yes - -- name: start gCore - become: yes - become_user: "{{ ghn_user }}" - shell: "{{ globus_location }}/gcore-start.sh" diff --git a/ghn-gcore/gcore-softwaregateway/templates/GHNConfig.xml b/ghn-gcore/gcore-softwaregateway/templates/GHNConfig.xml deleted file mode 100755 index 31c2d44e..00000000 --- a/ghn-gcore/gcore-softwaregateway/templates/GHNConfig.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ghn-gcore/gcore-upgrade/tasks/main.yml b/ghn-gcore/gcore-upgrade/tasks/main.yml deleted file mode 100644 index cf17849b..00000000 --- a/ghn-gcore/gcore-upgrade/tasks/main.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: Download the Gcore upgrade script - become: True - become_user: '{{ item }}' - get_url: url={{ gcore_upgrade_script_url }} dest=/home/{{ item }} validate_certs=no - with_items: '{{ gcube_users }}' - tags: gcore_upgrade - -- name: Run the Gcore upgrade script - become: True - become_user: '{{ item }}' - shell: . /home/{{ item }}/.bashrc ; cd /home/{{ item }} ; chmod 555 ./{{ gcore_upgrade_script }} ; ./{{ gcore_upgrade_script }} {{ http_port }} {{ restart_on_upgrade }} force - with_items: '{{ gcube_users }}' - tags: gcore_upgrade - diff --git a/ghn-gcore/ghn-gcore-maintenance/defaults/main.yml b/ghn-gcore/ghn-gcore-maintenance/defaults/main.yml deleted file mode 100644 index ef93eea0..00000000 --- a/ghn-gcore/ghn-gcore-maintenance/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -gcore_maintenance_restart_cron: False -gcore_maintenance_log_files_cleanup: True -gcore_maintenance_log_files_cleanup_script: '/usr/local/bin/clean_access_log' - -gcore_weekday_cron_run: '*' -gcore_maintenance_cron_users: - - { user: '{{ d4science_user }}', weekday: "{{ gcore_weekday_cron_run }}", job: "echo '`date`' >{{ d4science_user_home }}/gcore_service_restart.log ; {{ d4science_user_home }}/stopContainer.sh >>{{ d4science_user_home }}/gcore_service_restart.log 2>&1 ; sleep 30 ; {{ d4science_user_home }}/startContainer.sh >>{{ d4science_user_home }}/gcore_service_restart.log 2>&1", logrotate_job: '{{ gcore_maintenance_log_files_cleanup_script }}' } - diff --git a/ghn-gcore/ghn-gcore-maintenance/files/clean_access_log.sh b/ghn-gcore/ghn-gcore-maintenance/files/clean_access_log.sh deleted file mode 100644 index c3c910c4..00000000 --- a/ghn-gcore/ghn-gcore-maintenance/files/clean_access_log.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -RETVAL= -cd "$HOME/gCore/logs" -RETVAL=$? -if [ $RETVAL -ne 0 ] ; then - logger "The $HOME/gCore/logs does not exist, exiting." - exit 1 -fi - -gzip -v9 access.log.????-??-?? - -/bin/ls -1t access.log.????-??-??.gz | tail -n +91 | xargs rm -v - -exit 0 - diff --git a/ghn-gcore/ghn-gcore-maintenance/tasks/main.yml b/ghn-gcore/ghn-gcore-maintenance/tasks/main.yml deleted file mode 100644 index abc254c1..00000000 --- a/ghn-gcore/ghn-gcore-maintenance/tasks/main.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -- block: - - name: Install a cron job that restarts the registry gCore service - cron: name="Restart the {{ item.user }} gCore service" - minute="{{ item.minute | default(0) }}" - hour="{{ item.hour | default(3) }}" - weekday="{{ item.weekday | default('*') }}" - day="{{ item.day | default('*') }}" - user="{{ item.user }}" - job="{{ item.job }}" - disabled="{{ item.disabled | default(False) }}" - with_items: '{{ gcore_maintenance_cron_users }}' - - when: gcore_maintenance_restart_cron - tags: [ 'gcoreboot', 'gcore_cron' ] - -- block: - - name: Remove the cron job that restarts the registry gCore service - cron: name="Restart the {{ item.user }} gCore service" - minute="{{ item.minute | default(0) }}" - hour="{{ item.hour | default(3) }}" - weekday="{{ item.weekday | default('*') }}" - day="{{ item.day | default('*') }}" - user="{{ item.user }}" - job="{{ item.job }}" - disabled="{{ item.disabled | default(False) }}" - state=absent - with_items: '{{ gcore_maintenance_cron_users }}' - - when: not gcore_maintenance_restart_cron - tags: [ 'gcoreboot', 'gcore_cron' ] - -- block: - - name: Install the log cleanup script - copy: src=clean_access_log.sh dest={{ gcore_maintenance_log_files_cleanup_script }} mode=0755 owner=root group=root - - - name: Install a cron job that removes the old log files - cron: name="Cleanup the {{ item.user }} gCore log files" - special_time='daily' - user="{{ item.user }}" - job="{{ item.logrotate_job }}" - disabled="{{ item.disabled | default(False) }}" - with_items: '{{ gcore_maintenance_cron_users }}' - when: item.logrotate_job is defined - - when: gcore_maintenance_log_files_cleanup - tags: [ 'gcoreboot', 'gcore_cron', 'gcore_logs' ] - -- block: - - name: Remove the cron job that restarts the registry gCore service - cron: name="Cleanup the {{ item.user }} gCore log files" - special_time='daily' - user="{{ item.user }}" - job="{{ item.logrotate_job }}" - disabled="{{ item.disabled | default(False) }}" - state=absent - with_items: '{{ gcore_maintenance_cron_users }}' - when: item.logrotate_job is defined - - when: not gcore_maintenance_log_files_cleanup - tags: [ 'gcoreboot', 'gcore_cron', 'gcore_logs' ] diff --git a/ghn-gcore/ghn-gcoreboot/defaults/main.yml b/ghn-gcore/ghn-gcoreboot/defaults/main.yml deleted file mode 100644 index 52349cc3..00000000 --- a/ghn-gcore/ghn-gcoreboot/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -gcoreboot_install: False -gcoreboot_enabled: False -gcoreboot_startcontainer: startContainer.sh -gcoreboot_stopcontainer: stopContainer.sh diff --git a/ghn-gcore/ghn-gcoreboot/files/startContainer.sh b/ghn-gcore/ghn-gcoreboot/files/startContainer.sh deleted file mode 100644 index 27b0c69d..00000000 --- a/ghn-gcore/ghn-gcoreboot/files/startContainer.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -cd $HOME -if [ -f .gcorerc ] ; then - . .gcorerc - - gcore-start-container -fi diff --git a/ghn-gcore/ghn-gcoreboot/files/stopContainer.sh b/ghn-gcore/ghn-gcoreboot/files/stopContainer.sh deleted file mode 100644 index 9d5ab670..00000000 --- a/ghn-gcore/ghn-gcoreboot/files/stopContainer.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -cd $HOME -if [ -f .gcorerc ] ; then - . .gcorerc - gcore-stop-container -fi - - diff --git a/ghn-gcore/ghn-gcoreboot/tasks/main.yml b/ghn-gcore/ghn-gcoreboot/tasks/main.yml deleted file mode 100644 index 4d3f1e29..00000000 --- a/ghn-gcore/ghn-gcoreboot/tasks/main.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- block: - - name: Install the gcore boot script - template: src=gcore.j2 dest=/etc/init.d/{{ item }} owner=root group=root mode=0755 - with_items: 'gcore' - - - name: Install the start script inside the users home directory - copy: src={{ gcoreboot_startcontainer }} dest=/home/{{ item }}/{{ gcoreboot_startcontainer }} owner={{ item }} group={{ item }} mode=0755 - with_items: '{{ gcore_users }}' - - - name: Install the stop script inside the users home directory - copy: src={{ gcoreboot_stopcontainer }} dest=/home/{{ item }}/{{ gcoreboot_stopcontainer }} owner={{ item }} group={{ item }} mode=0755 - with_items: '{{ gcore_users }}' - - - name: Enable the gcore boot script - file: src=/etc/init.d/{{ item.path }} dest=/etc/{{ item.dest }} state=link - with_items: - - { path: 'gcore', dest: 'rc2.d/S95gcore' } - - { path: 'gcore', dest: 'rc3.d/S95gcore' } - - { path: 'gcore', dest: 'rc0.d/K25gcore' } - - { path: 'gcore', dest: 'rc1.d/K25gcore' } - - when: gcoreboot_install - tags: [ 'gcoreboot' ] - -- block: - - name: Remove the gcore boot script - file: dest=/etc/init.d/{{ item }} state=absent - with_items: 'gcore' - - - name: disable the gcore boot script - file: dest=/etc/{{ item.dest }} state=absent - with_items: - - { path: 'gcore', dest: 'rc2.d/S95gcore' } - - { path: 'gcore', dest: 'rc3.d/S95gcore' } - - { path: 'gcore', dest: 'rc0.d/K25gcore' } - - { path: 'gcore', dest: 'rc1.d/K25gcore' } - - when: not gcoreboot_install - tags: [ 'gcoreboot' ] diff --git a/ghn-gcore/ghn-gcoreboot/templates/gcore.j2 b/ghn-gcore/ghn-gcoreboot/templates/gcore.j2 deleted file mode 100644 index 2b23dbac..00000000 --- a/ghn-gcore/ghn-gcoreboot/templates/gcore.j2 +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) -case "${1:-''}" in - 'start') - test=$(cat /etc/passwd | cut -d":" -f1 | grep gcube) - for elemento in $test; do - echo "entering on $elemento" - path="/home/$elemento/startContainer.sh" - if [ -e "$path" ] - then - su $elemento -c "source $path" - fi - echo "exiting from $elemento" - done - ;; - 'stop') - test=$(cat /etc/passwd | cut -d":" -f1 | grep gcube) - for elemento in $test; do - echo "entering on $elemento" - path="/home/$elemento/stopContainer.sh" - if [ -e "$path" ] - then - su $elemento -c "source $path" - fi - echo "exiting from $elemento" - done - ;; -*) - echo "Usage: $SELF {start|stop}" - exit 1 - ;; -esac - diff --git a/ghn-gcore/ghn-update/tasks/main.yml b/ghn-gcore/ghn-update/tasks/main.yml deleted file mode 100644 index c75b9cbf..00000000 --- a/ghn-gcore/ghn-update/tasks/main.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -# Old stuff, do not use -# -- name: Stop the gcube service - shell: /home/{{ gcube_user }}/stopContainer.sh >/dev/null 2>&1 - #shell: su - {{ gcube_user }} /home/{{ gcube_user }}/gCore/bin/gcore-stop-container - ignore_errors: True - tags: - - ghn - -- name: Install the new ghn release - action: ghn_r_cluster user={{ gcube_user }} - tags: - - ghn - -- name: Replace the hostname in the gCore/etc/globus_wsrf_core/server-config.wsdd configuration file - lineinfile: dest=/home/{{ gcube_user }}/gCore/etc/globus_wsrf_core/server-config.wsdd regexp="" line="" - tags: - - ghn - - ghnconfig - -- name: Replace JAVA_HOME in /home/{{ gcube_user }}/.gcorerc - lineinfile: dest=/home/{{ gcube_user }}/.gcorerc regexp="^export JAVA_HOME=.*" line="export JAVA_HOME={{ jdk_java_home }}" - tags: - - ghn - - ghnconfig - - jdk diff --git a/ghn-gcore/provide-gcube-key/handlers/main.yml b/ghn-gcore/provide-gcube-key/handlers/main.yml deleted file mode 100644 index 8184f347..00000000 --- a/ghn-gcore/provide-gcube-key/handlers/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Restart ghn webservice - shell: /etc/init.d/gcore stop ; /etc/init.d/gcore start - when: - - restart_gcore_service - - ( has_tomcat is defined ) and ( not has_tomcat ) - ignore_errors: True - diff --git a/ghn-gcore/provide-gcube-key/tasks/main.yml b/ghn-gcore/provide-gcube-key/tasks/main.yml deleted file mode 100644 index 39049da5..00000000 --- a/ghn-gcore/provide-gcube-key/tasks/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Install the gcube keys - copy: src=/tmp/symm.key dest=/home/{{ item.0 }}/{{ gcube_conf_path }}/{{ item.1 }} owner={{ item.0 }} group={{ item.0 }} mode=0400 - with_nested: - - '{{ gcube_users }}' - - '{{ gcube_symm_key_file }}' - notify: Restart ghn webservice - tags: - - gcube_key - diff --git a/library/roles/.vscode/settings.json b/library/roles/.vscode/settings.json new file mode 100644 index 00000000..3ba06eda --- /dev/null +++ b/library/roles/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "files.exclude": { + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true + } +} \ No newline at end of file diff --git a/ELK/elasticHQ/defaults/main.yml b/library/roles/ELK/elasticHQ/defaults/main.yml similarity index 100% rename from ELK/elasticHQ/defaults/main.yml rename to library/roles/ELK/elasticHQ/defaults/main.yml diff --git a/ELK/elasticHQ/handlers/main.yml b/library/roles/ELK/elasticHQ/handlers/main.yml similarity index 100% rename from ELK/elasticHQ/handlers/main.yml rename to library/roles/ELK/elasticHQ/handlers/main.yml diff --git a/ELK/elasticHQ/meta/main.yml b/library/roles/ELK/elasticHQ/meta/main.yml similarity index 100% rename from ELK/elasticHQ/meta/main.yml rename to library/roles/ELK/elasticHQ/meta/main.yml diff --git a/ELK/elasticHQ/tasks/main.yml b/library/roles/ELK/elasticHQ/tasks/main.yml similarity index 100% rename from ELK/elasticHQ/tasks/main.yml rename to library/roles/ELK/elasticHQ/tasks/main.yml diff --git a/ELK/elasticHQ/templates/elastichq.systemd.j2 b/library/roles/ELK/elasticHQ/templates/elastichq.systemd.j2 similarity index 100% rename from ELK/elasticHQ/templates/elastichq.systemd.j2 rename to library/roles/ELK/elasticHQ/templates/elastichq.systemd.j2 diff --git a/ELK/elasticsearch/defaults/main.yml b/library/roles/ELK/elasticsearch/defaults/main.yml similarity index 100% rename from ELK/elasticsearch/defaults/main.yml rename to library/roles/ELK/elasticsearch/defaults/main.yml diff --git a/ELK/elasticsearch/handlers/main.yml b/library/roles/ELK/elasticsearch/handlers/main.yml similarity index 100% rename from ELK/elasticsearch/handlers/main.yml rename to library/roles/ELK/elasticsearch/handlers/main.yml diff --git a/ELK/elasticsearch/meta/main.yml b/library/roles/ELK/elasticsearch/meta/main.yml similarity index 100% rename from ELK/elasticsearch/meta/main.yml rename to library/roles/ELK/elasticsearch/meta/main.yml diff --git a/ELK/elasticsearch/tasks/elasticsearch.yml b/library/roles/ELK/elasticsearch/tasks/elasticsearch.yml similarity index 100% rename from ELK/elasticsearch/tasks/elasticsearch.yml rename to library/roles/ELK/elasticsearch/tasks/elasticsearch.yml diff --git a/ELK/elasticsearch/tasks/main.yml b/library/roles/ELK/elasticsearch/tasks/main.yml similarity index 100% rename from ELK/elasticsearch/tasks/main.yml rename to library/roles/ELK/elasticsearch/tasks/main.yml diff --git a/ELK/elasticsearch/tasks/plugins.yml b/library/roles/ELK/elasticsearch/tasks/plugins.yml similarity index 100% rename from ELK/elasticsearch/tasks/plugins.yml rename to library/roles/ELK/elasticsearch/tasks/plugins.yml diff --git a/ELK/elasticsearch/templates/elasticsearch-default.j2 b/library/roles/ELK/elasticsearch/templates/elasticsearch-default.j2 similarity index 100% rename from ELK/elasticsearch/templates/elasticsearch-default.j2 rename to library/roles/ELK/elasticsearch/templates/elasticsearch-default.j2 diff --git a/ELK/elasticsearch/templates/elasticsearch.yml.j2 b/library/roles/ELK/elasticsearch/templates/elasticsearch.yml.j2 similarity index 100% rename from ELK/elasticsearch/templates/elasticsearch.yml.j2 rename to library/roles/ELK/elasticsearch/templates/elasticsearch.yml.j2 diff --git a/ELK/elasticsearch/templates/jvm.options.j2 b/library/roles/ELK/elasticsearch/templates/jvm.options.j2 similarity index 100% rename from ELK/elasticsearch/templates/jvm.options.j2 rename to library/roles/ELK/elasticsearch/templates/jvm.options.j2 diff --git a/R/defaults/main.yml b/library/roles/R/defaults/main.yml similarity index 100% rename from R/defaults/main.yml rename to library/roles/R/defaults/main.yml diff --git a/R/files/r_packages_cleanup.sh b/library/roles/R/files/r_packages_cleanup.sh similarity index 100% rename from R/files/r_packages_cleanup.sh rename to library/roles/R/files/r_packages_cleanup.sh diff --git a/R/tasks/main.yml b/library/roles/R/tasks/main.yml similarity index 100% rename from R/tasks/main.yml rename to library/roles/R/tasks/main.yml diff --git a/R/tasks/r-installation.yml b/library/roles/R/tasks/r-installation.yml similarity index 100% rename from R/tasks/r-installation.yml rename to library/roles/R/tasks/r-installation.yml diff --git a/R/tasks/r-packages-updater.yml b/library/roles/R/tasks/r-packages-updater.yml similarity index 100% rename from R/tasks/r-packages-updater.yml rename to library/roles/R/tasks/r-packages-updater.yml diff --git a/R/tasks/r-packages_cleanup.yml b/library/roles/R/tasks/r-packages_cleanup.yml similarity index 100% rename from R/tasks/r-packages_cleanup.yml rename to library/roles/R/tasks/r-packages_cleanup.yml diff --git a/R/templates/Rprofile.site.j2 b/library/roles/R/templates/Rprofile.site.j2 similarity index 100% rename from R/templates/Rprofile.site.j2 rename to library/roles/R/templates/Rprofile.site.j2 diff --git a/R/templates/update_r_packages.sh.j2 b/library/roles/R/templates/update_r_packages.sh.j2 similarity index 100% rename from R/templates/update_r_packages.sh.j2 rename to library/roles/R/templates/update_r_packages.sh.j2 diff --git a/ansible_ppa/defaults/main.yml b/library/roles/ansible_ppa/defaults/main.yml similarity index 100% rename from ansible_ppa/defaults/main.yml rename to library/roles/ansible_ppa/defaults/main.yml diff --git a/ansible_ppa/tasks/ansible-config.yml b/library/roles/ansible_ppa/tasks/ansible-config.yml similarity index 100% rename from ansible_ppa/tasks/ansible-config.yml rename to library/roles/ansible_ppa/tasks/ansible-config.yml diff --git a/ansible_ppa/tasks/ansible-packages.yml b/library/roles/ansible_ppa/tasks/ansible-packages.yml similarity index 100% rename from ansible_ppa/tasks/ansible-packages.yml rename to library/roles/ansible_ppa/tasks/ansible-packages.yml diff --git a/ansible_ppa/tasks/main.yml b/library/roles/ansible_ppa/tasks/main.yml similarity index 100% rename from ansible_ppa/tasks/main.yml rename to library/roles/ansible_ppa/tasks/main.yml diff --git a/apache/defaults/main.yml b/library/roles/apache/defaults/main.yml similarity index 100% rename from apache/defaults/main.yml rename to library/roles/apache/defaults/main.yml diff --git a/apache/files/apache-letsencrypt-acme.sh b/library/roles/apache/files/apache-letsencrypt-acme.sh similarity index 100% rename from apache/files/apache-letsencrypt-acme.sh rename to library/roles/apache/files/apache-letsencrypt-acme.sh diff --git a/apache/handlers/main.yml b/library/roles/apache/handlers/main.yml similarity index 100% rename from apache/handlers/main.yml rename to library/roles/apache/handlers/main.yml diff --git a/apache/tasks/apache-basic-auth.yml b/library/roles/apache/tasks/apache-basic-auth.yml similarity index 100% rename from apache/tasks/apache-basic-auth.yml rename to library/roles/apache/tasks/apache-basic-auth.yml diff --git a/apache/tasks/apache-letsencrypt.yml b/library/roles/apache/tasks/apache-letsencrypt.yml similarity index 100% rename from apache/tasks/apache-letsencrypt.yml rename to library/roles/apache/tasks/apache-letsencrypt.yml diff --git a/apache/tasks/apache-modules.yml b/library/roles/apache/tasks/apache-modules.yml similarity index 100% rename from apache/tasks/apache-modules.yml rename to library/roles/apache/tasks/apache-modules.yml diff --git a/apache/tasks/apache-ppa.yml b/library/roles/apache/tasks/apache-ppa.yml similarity index 100% rename from apache/tasks/apache-ppa.yml rename to library/roles/apache/tasks/apache-ppa.yml diff --git a/apache/tasks/apache.yml b/library/roles/apache/tasks/apache.yml similarity index 100% rename from apache/tasks/apache.yml rename to library/roles/apache/tasks/apache.yml diff --git a/apache/tasks/main.yml b/library/roles/apache/tasks/main.yml similarity index 100% rename from apache/tasks/main.yml rename to library/roles/apache/tasks/main.yml diff --git a/apache/templates/info.conf.j2 b/library/roles/apache/templates/info.conf.j2 similarity index 100% rename from apache/templates/info.conf.j2 rename to library/roles/apache/templates/info.conf.j2 diff --git a/apache/templates/letsencrypt-proxy.conf.j2 b/library/roles/apache/templates/letsencrypt-proxy.conf.j2 similarity index 100% rename from apache/templates/letsencrypt-proxy.conf.j2 rename to library/roles/apache/templates/letsencrypt-proxy.conf.j2 diff --git a/apache/templates/ports.conf b/library/roles/apache/templates/ports.conf similarity index 100% rename from apache/templates/ports.conf rename to library/roles/apache/templates/ports.conf diff --git a/apache/templates/status.conf.j2 b/library/roles/apache/templates/status.conf.j2 similarity index 100% rename from apache/templates/status.conf.j2 rename to library/roles/apache/templates/status.conf.j2 diff --git a/bind-caching-server/defaults/main.yml b/library/roles/bind-caching-server/defaults/main.yml similarity index 100% rename from bind-caching-server/defaults/main.yml rename to library/roles/bind-caching-server/defaults/main.yml diff --git a/bind-caching-server/handlers/main.yml b/library/roles/bind-caching-server/handlers/main.yml similarity index 100% rename from bind-caching-server/handlers/main.yml rename to library/roles/bind-caching-server/handlers/main.yml diff --git a/bind-caching-server/tasks/main.yml b/library/roles/bind-caching-server/tasks/main.yml similarity index 100% rename from bind-caching-server/tasks/main.yml rename to library/roles/bind-caching-server/tasks/main.yml diff --git a/bind-caching-server/templates/named.conf.options.j2 b/library/roles/bind-caching-server/templates/named.conf.options.j2 similarity index 100% rename from bind-caching-server/templates/named.conf.options.j2 rename to library/roles/bind-caching-server/templates/named.conf.options.j2 diff --git a/cassandra/defaults/main.yml b/library/roles/cassandra/defaults/main.yml similarity index 100% rename from cassandra/defaults/main.yml rename to library/roles/cassandra/defaults/main.yml diff --git a/cassandra/handlers/main.yml b/library/roles/cassandra/handlers/main.yml similarity index 100% rename from cassandra/handlers/main.yml rename to library/roles/cassandra/handlers/main.yml diff --git a/cassandra/tasks/main.yml b/library/roles/cassandra/tasks/main.yml similarity index 100% rename from cassandra/tasks/main.yml rename to library/roles/cassandra/tasks/main.yml diff --git a/chkconfig/tasks/main.yml b/library/roles/chkconfig/tasks/main.yml similarity index 100% rename from chkconfig/tasks/main.yml rename to library/roles/chkconfig/tasks/main.yml diff --git a/ckan/ckan-solr/defaults/main.yml b/library/roles/ckan/ckan-solr/defaults/main.yml similarity index 100% rename from ckan/ckan-solr/defaults/main.yml rename to library/roles/ckan/ckan-solr/defaults/main.yml diff --git a/ckan/ckan-solr/files/schema.xml b/library/roles/ckan/ckan-solr/files/schema.xml similarity index 100% rename from ckan/ckan-solr/files/schema.xml rename to library/roles/ckan/ckan-solr/files/schema.xml diff --git a/ckan/ckan-solr/handlers/main.yml b/library/roles/ckan/ckan-solr/handlers/main.yml similarity index 100% rename from ckan/ckan-solr/handlers/main.yml rename to library/roles/ckan/ckan-solr/handlers/main.yml diff --git a/ckan/ckan-solr/tasks/main.yml b/library/roles/ckan/ckan-solr/tasks/main.yml similarity index 100% rename from ckan/ckan-solr/tasks/main.yml rename to library/roles/ckan/ckan-solr/tasks/main.yml diff --git a/ckan/ckan-solr/vars/main.yml b/library/roles/ckan/ckan-solr/vars/main.yml similarity index 100% rename from ckan/ckan-solr/vars/main.yml rename to library/roles/ckan/ckan-solr/vars/main.yml diff --git a/ckan/ckan/defaults/main.yml b/library/roles/ckan/ckan/defaults/main.yml similarity index 100% rename from ckan/ckan/defaults/main.yml rename to library/roles/ckan/ckan/defaults/main.yml diff --git a/ckan/ckan/files/schema.xml b/library/roles/ckan/ckan/files/schema.xml similarity index 100% rename from ckan/ckan/files/schema.xml rename to library/roles/ckan/ckan/files/schema.xml diff --git a/ckan/ckan/handlers/main.yml b/library/roles/ckan/ckan/handlers/main.yml similarity index 100% rename from ckan/ckan/handlers/main.yml rename to library/roles/ckan/ckan/handlers/main.yml diff --git a/ckan/ckan/tasks/ckan-config.yml b/library/roles/ckan/ckan/tasks/ckan-config.yml similarity index 100% rename from ckan/ckan/tasks/ckan-config.yml rename to library/roles/ckan/ckan/tasks/ckan-config.yml diff --git a/ckan/ckan/tasks/ckan-memcache.yml b/library/roles/ckan/ckan/tasks/ckan-memcache.yml similarity index 100% rename from ckan/ckan/tasks/ckan-memcache.yml rename to library/roles/ckan/ckan/tasks/ckan-memcache.yml diff --git a/ckan/ckan/tasks/ckan-plugins.yml b/library/roles/ckan/ckan/tasks/ckan-plugins.yml similarity index 100% rename from ckan/ckan/tasks/ckan-plugins.yml rename to library/roles/ckan/ckan/tasks/ckan-plugins.yml diff --git a/ckan/ckan/tasks/ckan.yml b/library/roles/ckan/ckan/tasks/ckan.yml similarity index 100% rename from ckan/ckan/tasks/ckan.yml rename to library/roles/ckan/ckan/tasks/ckan.yml diff --git a/ckan/ckan/tasks/enable-ckan.yml b/library/roles/ckan/ckan/tasks/enable-ckan.yml similarity index 100% rename from ckan/ckan/tasks/enable-ckan.yml rename to library/roles/ckan/ckan/tasks/enable-ckan.yml diff --git a/ckan/ckan/tasks/main.yml b/library/roles/ckan/ckan/tasks/main.yml similarity index 100% rename from ckan/ckan/tasks/main.yml rename to library/roles/ckan/ckan/tasks/main.yml diff --git a/ckan/ckan/tasks/supervisor.yml b/library/roles/ckan/ckan/tasks/supervisor.yml similarity index 100% rename from ckan/ckan/tasks/supervisor.yml rename to library/roles/ckan/ckan/tasks/supervisor.yml diff --git a/ckan/ckan/templates/apache.wsgi.j2 b/library/roles/ckan/ckan/templates/apache.wsgi.j2 similarity index 100% rename from ckan/ckan/templates/apache.wsgi.j2 rename to library/roles/ckan/ckan/templates/apache.wsgi.j2 diff --git a/ckan/ckan/templates/ckan_harvesting.conf.j2 b/library/roles/ckan/ckan/templates/ckan_harvesting.conf.j2 similarity index 100% rename from ckan/ckan/templates/ckan_harvesting.conf.j2 rename to library/roles/ckan/ckan/templates/ckan_harvesting.conf.j2 diff --git a/ckan/ckan/templates/pgpass.j2 b/library/roles/ckan/ckan/templates/pgpass.j2 similarity index 100% rename from ckan/ckan/templates/pgpass.j2 rename to library/roles/ckan/ckan/templates/pgpass.j2 diff --git a/ckan/ckan/templates/tracker_update.sh.j2 b/library/roles/ckan/ckan/templates/tracker_update.sh.j2 similarity index 100% rename from ckan/ckan/templates/tracker_update.sh.j2 rename to library/roles/ckan/ckan/templates/tracker_update.sh.j2 diff --git a/cloud-init/defaults/main.yml b/library/roles/cloud-init/defaults/main.yml similarity index 100% rename from cloud-init/defaults/main.yml rename to library/roles/cloud-init/defaults/main.yml diff --git a/cloud-init/files/99-disable-network-config.cfg b/library/roles/cloud-init/files/99-disable-network-config.cfg similarity index 100% rename from cloud-init/files/99-disable-network-config.cfg rename to library/roles/cloud-init/files/99-disable-network-config.cfg diff --git a/cloud-init/tasks/main.yml b/library/roles/cloud-init/tasks/main.yml similarity index 100% rename from cloud-init/tasks/main.yml rename to library/roles/cloud-init/tasks/main.yml diff --git a/composer/defaults/main.yml b/library/roles/composer/defaults/main.yml similarity index 100% rename from composer/defaults/main.yml rename to library/roles/composer/defaults/main.yml diff --git a/composer/tasks/main.yml b/library/roles/composer/tasks/main.yml similarity index 100% rename from composer/tasks/main.yml rename to library/roles/composer/tasks/main.yml diff --git a/composer/templates/composer-installer.j2 b/library/roles/composer/templates/composer-installer.j2 similarity index 100% rename from composer/templates/composer-installer.j2 rename to library/roles/composer/templates/composer-installer.j2 diff --git a/conda/defaults/main.yml b/library/roles/conda/defaults/main.yml similarity index 100% rename from conda/defaults/main.yml rename to library/roles/conda/defaults/main.yml diff --git a/conda/meta/main.yml b/library/roles/conda/meta/main.yml similarity index 100% rename from conda/meta/main.yml rename to library/roles/conda/meta/main.yml diff --git a/conda/tasks/main.yml b/library/roles/conda/tasks/main.yml similarity index 100% rename from conda/tasks/main.yml rename to library/roles/conda/tasks/main.yml diff --git a/conda/vars/main.yml b/library/roles/conda/vars/main.yml similarity index 100% rename from conda/vars/main.yml rename to library/roles/conda/vars/main.yml diff --git a/couchbase/defaults/main.yml b/library/roles/couchbase/defaults/main.yml similarity index 100% rename from couchbase/defaults/main.yml rename to library/roles/couchbase/defaults/main.yml diff --git a/couchbase/handlers/main.yml b/library/roles/couchbase/handlers/main.yml similarity index 100% rename from couchbase/handlers/main.yml rename to library/roles/couchbase/handlers/main.yml diff --git a/couchbase/tasks/couchbase.yml b/library/roles/couchbase/tasks/couchbase.yml similarity index 100% rename from couchbase/tasks/couchbase.yml rename to library/roles/couchbase/tasks/couchbase.yml diff --git a/couchbase/tasks/ganglia-plugin.yml b/library/roles/couchbase/tasks/ganglia-plugin.yml similarity index 100% rename from couchbase/tasks/ganglia-plugin.yml rename to library/roles/couchbase/tasks/ganglia-plugin.yml diff --git a/couchbase/tasks/main.yml b/library/roles/couchbase/tasks/main.yml similarity index 100% rename from couchbase/tasks/main.yml rename to library/roles/couchbase/tasks/main.yml diff --git a/couchbase/tasks/swappiness.yml b/library/roles/couchbase/tasks/swappiness.yml similarity index 100% rename from couchbase/tasks/swappiness.yml rename to library/roles/couchbase/tasks/swappiness.yml diff --git a/couchbase/templates/couchbase.py.j2 b/library/roles/couchbase/templates/couchbase.py.j2 similarity index 100% rename from couchbase/templates/couchbase.py.j2 rename to library/roles/couchbase/templates/couchbase.py.j2 diff --git a/couchbase/templates/couchbase.pyconf.j2 b/library/roles/couchbase/templates/couchbase.pyconf.j2 similarity index 100% rename from couchbase/templates/couchbase.pyconf.j2 rename to library/roles/couchbase/templates/couchbase.pyconf.j2 diff --git a/couchbase/templates/couchbase_backup.j2 b/library/roles/couchbase/templates/couchbase_backup.j2 similarity index 100% rename from couchbase/templates/couchbase_backup.j2 rename to library/roles/couchbase/templates/couchbase_backup.j2 diff --git a/couchdb/defaults/main.yml b/library/roles/couchdb/defaults/main.yml similarity index 100% rename from couchdb/defaults/main.yml rename to library/roles/couchdb/defaults/main.yml diff --git a/couchdb/files/couchdb.py b/library/roles/couchdb/files/couchdb.py similarity index 100% rename from couchdb/files/couchdb.py rename to library/roles/couchdb/files/couchdb.py diff --git a/couchdb/handlers/main.yml b/library/roles/couchdb/handlers/main.yml similarity index 100% rename from couchdb/handlers/main.yml rename to library/roles/couchdb/handlers/main.yml diff --git a/couchdb/tasks/couchdb-1.yml b/library/roles/couchdb/tasks/couchdb-1.yml similarity index 100% rename from couchdb/tasks/couchdb-1.yml rename to library/roles/couchdb/tasks/couchdb-1.yml diff --git a/couchdb/tasks/couchdb-2.yml b/library/roles/couchdb/tasks/couchdb-2.yml similarity index 100% rename from couchdb/tasks/couchdb-2.yml rename to library/roles/couchdb/tasks/couchdb-2.yml diff --git a/couchdb/tasks/ganglia-plugin.yml b/library/roles/couchdb/tasks/ganglia-plugin.yml similarity index 100% rename from couchdb/tasks/ganglia-plugin.yml rename to library/roles/couchdb/tasks/ganglia-plugin.yml diff --git a/couchdb/tasks/main.yml b/library/roles/couchdb/tasks/main.yml similarity index 100% rename from couchdb/tasks/main.yml rename to library/roles/couchdb/tasks/main.yml diff --git a/couchdb/templates/couchdb.pyconf.j2 b/library/roles/couchdb/templates/couchdb.pyconf.j2 similarity index 100% rename from couchdb/templates/couchdb.pyconf.j2 rename to library/roles/couchdb/templates/couchdb.pyconf.j2 diff --git a/couchdb/templates/limits-couchdb.nofiles.j2 b/library/roles/couchdb/templates/limits-couchdb.nofiles.j2 similarity index 100% rename from couchdb/templates/limits-couchdb.nofiles.j2 rename to library/roles/couchdb/templates/limits-couchdb.nofiles.j2 diff --git a/create_new_role_stub b/library/roles/create_new_role_stub similarity index 100% rename from create_new_role_stub rename to library/roles/create_new_role_stub diff --git a/curl-tester/defaults/main.yml b/library/roles/curl-tester/defaults/main.yml similarity index 100% rename from curl-tester/defaults/main.yml rename to library/roles/curl-tester/defaults/main.yml diff --git a/curl-tester/tasks/main.yml b/library/roles/curl-tester/tasks/main.yml similarity index 100% rename from curl-tester/tasks/main.yml rename to library/roles/curl-tester/tasks/main.yml diff --git a/d4s_user_services_perms/README.md b/library/roles/d4s_user_services_perms/README.md similarity index 100% rename from d4s_user_services_perms/README.md rename to library/roles/d4s_user_services_perms/README.md diff --git a/d4s_user_services_perms/defaults/main.yml b/library/roles/d4s_user_services_perms/defaults/main.yml similarity index 100% rename from d4s_user_services_perms/defaults/main.yml rename to library/roles/d4s_user_services_perms/defaults/main.yml diff --git a/d4s_user_services_perms/tasks/d4s-basic-node.yml b/library/roles/d4s_user_services_perms/tasks/d4s-basic-node.yml similarity index 100% rename from d4s_user_services_perms/tasks/d4s-basic-node.yml rename to library/roles/d4s_user_services_perms/tasks/d4s-basic-node.yml diff --git a/d4s_user_services_perms/tasks/d4s-service-node.yml b/library/roles/d4s_user_services_perms/tasks/d4s-service-node.yml similarity index 100% rename from d4s_user_services_perms/tasks/d4s-service-node.yml rename to library/roles/d4s_user_services_perms/tasks/d4s-service-node.yml diff --git a/d4s_user_services_perms/tasks/d4s-smartgears-node.yml b/library/roles/d4s_user_services_perms/tasks/d4s-smartgears-node.yml similarity index 100% rename from d4s_user_services_perms/tasks/d4s-smartgears-node.yml rename to library/roles/d4s_user_services_perms/tasks/d4s-smartgears-node.yml diff --git a/d4s_user_services_perms/tasks/d4s-tomcat-node.yml b/library/roles/d4s_user_services_perms/tasks/d4s-tomcat-node.yml similarity index 100% rename from d4s_user_services_perms/tasks/d4s-tomcat-node.yml rename to library/roles/d4s_user_services_perms/tasks/d4s-tomcat-node.yml diff --git a/d4s_user_services_perms/tasks/main.yml b/library/roles/d4s_user_services_perms/tasks/main.yml similarity index 100% rename from d4s_user_services_perms/tasks/main.yml rename to library/roles/d4s_user_services_perms/tasks/main.yml diff --git a/d4s_user_services_perms/tasks/security_limits.yml b/library/roles/d4s_user_services_perms/tasks/security_limits.yml similarity index 100% rename from d4s_user_services_perms/tasks/security_limits.yml rename to library/roles/d4s_user_services_perms/tasks/security_limits.yml diff --git a/d4s_user_services_perms/tasks/users-data-dirs.yml b/library/roles/d4s_user_services_perms/tasks/users-data-dirs.yml similarity index 100% rename from d4s_user_services_perms/tasks/users-data-dirs.yml rename to library/roles/d4s_user_services_perms/tasks/users-data-dirs.yml diff --git a/d4s_user_services_perms/templates/README-service.j2 b/library/roles/d4s_user_services_perms/templates/README-service.j2 similarity index 100% rename from d4s_user_services_perms/templates/README-service.j2 rename to library/roles/d4s_user_services_perms/templates/README-service.j2 diff --git a/d4s_user_services_perms/templates/README-tomcat.j2 b/library/roles/d4s_user_services_perms/templates/README-tomcat.j2 similarity index 100% rename from d4s_user_services_perms/templates/README-tomcat.j2 rename to library/roles/d4s_user_services_perms/templates/README-tomcat.j2 diff --git a/d4s_user_services_perms/templates/README.j2 b/library/roles/d4s_user_services_perms/templates/README.j2 similarity index 100% rename from d4s_user_services_perms/templates/README.j2 rename to library/roles/d4s_user_services_perms/templates/README.j2 diff --git a/d4s_user_services_perms/templates/catalina-logrotate.j2 b/library/roles/d4s_user_services_perms/templates/catalina-logrotate.j2 similarity index 100% rename from d4s_user_services_perms/templates/catalina-logrotate.j2 rename to library/roles/d4s_user_services_perms/templates/catalina-logrotate.j2 diff --git a/d4s_user_services_perms/templates/d4science-sudoers.j2 b/library/roles/d4s_user_services_perms/templates/d4science-sudoers.j2 similarity index 100% rename from d4s_user_services_perms/templates/d4science-sudoers.j2 rename to library/roles/d4s_user_services_perms/templates/d4science-sudoers.j2 diff --git a/d4s_user_services_perms/templates/set-acl-rules.sh.j2 b/library/roles/d4s_user_services_perms/templates/set-acl-rules.sh.j2 similarity index 100% rename from d4s_user_services_perms/templates/set-acl-rules.sh.j2 rename to library/roles/d4s_user_services_perms/templates/set-acl-rules.sh.j2 diff --git a/d4s_user_services_perms/templates/startContainer.sh.j2 b/library/roles/d4s_user_services_perms/templates/startContainer.sh.j2 similarity index 100% rename from d4s_user_services_perms/templates/startContainer.sh.j2 rename to library/roles/d4s_user_services_perms/templates/startContainer.sh.j2 diff --git a/d4s_user_services_perms/templates/startservice.j2 b/library/roles/d4s_user_services_perms/templates/startservice.j2 similarity index 100% rename from d4s_user_services_perms/templates/startservice.j2 rename to library/roles/d4s_user_services_perms/templates/startservice.j2 diff --git a/d4s_user_services_perms/templates/stopContainer.sh.j2 b/library/roles/d4s_user_services_perms/templates/stopContainer.sh.j2 similarity index 100% rename from d4s_user_services_perms/templates/stopContainer.sh.j2 rename to library/roles/d4s_user_services_perms/templates/stopContainer.sh.j2 diff --git a/d4s_user_services_perms/templates/stopservice.j2 b/library/roles/d4s_user_services_perms/templates/stopservice.j2 similarity index 100% rename from d4s_user_services_perms/templates/stopservice.j2 rename to library/roles/d4s_user_services_perms/templates/stopservice.j2 diff --git a/d4s_user_services_perms/templates/tomcat-sudoers.j2 b/library/roles/d4s_user_services_perms/templates/tomcat-sudoers.j2 similarity index 100% rename from d4s_user_services_perms/templates/tomcat-sudoers.j2 rename to library/roles/d4s_user_services_perms/templates/tomcat-sudoers.j2 diff --git a/data_disk/defaults/main.yml b/library/roles/data_disk/defaults/main.yml similarity index 100% rename from data_disk/defaults/main.yml rename to library/roles/data_disk/defaults/main.yml diff --git a/data_disk/tasks/main.yml b/library/roles/data_disk/tasks/main.yml similarity index 100% rename from data_disk/tasks/main.yml rename to library/roles/data_disk/tasks/main.yml diff --git a/deb-apt-setup/tasks/main.yml b/library/roles/deb-apt-setup/tasks/main.yml similarity index 100% rename from deb-apt-setup/tasks/main.yml rename to library/roles/deb-apt-setup/tasks/main.yml diff --git a/deb-set-hostname/tasks/main.yml b/library/roles/deb-set-hostname/tasks/main.yml similarity index 100% rename from deb-set-hostname/tasks/main.yml rename to library/roles/deb-set-hostname/tasks/main.yml diff --git a/deb-set-locale/defaults/main.yml b/library/roles/deb-set-locale/defaults/main.yml similarity index 100% rename from deb-set-locale/defaults/main.yml rename to library/roles/deb-set-locale/defaults/main.yml diff --git a/deb-set-locale/tasks/main.yml b/library/roles/deb-set-locale/tasks/main.yml similarity index 100% rename from deb-set-locale/tasks/main.yml rename to library/roles/deb-set-locale/tasks/main.yml diff --git a/dell-server-utilities/defaults/main.yml b/library/roles/dell-server-utilities/defaults/main.yml similarity index 100% rename from dell-server-utilities/defaults/main.yml rename to library/roles/dell-server-utilities/defaults/main.yml diff --git a/dell-server-utilities/tasks/dsu_deb.yml b/library/roles/dell-server-utilities/tasks/dsu_deb.yml similarity index 100% rename from dell-server-utilities/tasks/dsu_deb.yml rename to library/roles/dell-server-utilities/tasks/dsu_deb.yml diff --git a/dell-server-utilities/tasks/dsu_rh.yml b/library/roles/dell-server-utilities/tasks/dsu_rh.yml similarity index 100% rename from dell-server-utilities/tasks/dsu_rh.yml rename to library/roles/dell-server-utilities/tasks/dsu_rh.yml diff --git a/dell-server-utilities/tasks/main.yml b/library/roles/dell-server-utilities/tasks/main.yml similarity index 100% rename from dell-server-utilities/tasks/main.yml rename to library/roles/dell-server-utilities/tasks/main.yml diff --git a/dnet-apt-repo/tasks/main.yml b/library/roles/dnet-apt-repo/tasks/main.yml similarity index 100% rename from dnet-apt-repo/tasks/main.yml rename to library/roles/dnet-apt-repo/tasks/main.yml diff --git a/dnet_user_services_perms/README.md b/library/roles/dnet_user_services_perms/README.md similarity index 100% rename from dnet_user_services_perms/README.md rename to library/roles/dnet_user_services_perms/README.md diff --git a/dnet_user_services_perms/defaults/main.yml b/library/roles/dnet_user_services_perms/defaults/main.yml similarity index 100% rename from dnet_user_services_perms/defaults/main.yml rename to library/roles/dnet_user_services_perms/defaults/main.yml diff --git a/dnet_user_services_perms/meta/main.yml b/library/roles/dnet_user_services_perms/meta/main.yml similarity index 100% rename from dnet_user_services_perms/meta/main.yml rename to library/roles/dnet_user_services_perms/meta/main.yml diff --git a/dnet_user_services_perms/tasks/dnet-additional-packages.yml b/library/roles/dnet_user_services_perms/tasks/dnet-additional-packages.yml similarity index 100% rename from dnet_user_services_perms/tasks/dnet-additional-packages.yml rename to library/roles/dnet_user_services_perms/tasks/dnet-additional-packages.yml diff --git a/dnet_user_services_perms/tasks/dnet-data-dirs.yml b/library/roles/dnet_user_services_perms/tasks/dnet-data-dirs.yml similarity index 100% rename from dnet_user_services_perms/tasks/dnet-data-dirs.yml rename to library/roles/dnet_user_services_perms/tasks/dnet-data-dirs.yml diff --git a/dnet_user_services_perms/tasks/dnet-groups.yml b/library/roles/dnet_user_services_perms/tasks/dnet-groups.yml similarity index 100% rename from dnet_user_services_perms/tasks/dnet-groups.yml rename to library/roles/dnet_user_services_perms/tasks/dnet-groups.yml diff --git a/dnet_user_services_perms/tasks/dnet-other-services-users.yml b/library/roles/dnet_user_services_perms/tasks/dnet-other-services-users.yml similarity index 100% rename from dnet_user_services_perms/tasks/dnet-other-services-users.yml rename to library/roles/dnet_user_services_perms/tasks/dnet-other-services-users.yml diff --git a/dnet_user_services_perms/tasks/dnet-tomcat-acls.yml b/library/roles/dnet_user_services_perms/tasks/dnet-tomcat-acls.yml similarity index 100% rename from dnet_user_services_perms/tasks/dnet-tomcat-acls.yml rename to library/roles/dnet_user_services_perms/tasks/dnet-tomcat-acls.yml diff --git a/dnet_user_services_perms/tasks/dnet-users-data-dirs.yml b/library/roles/dnet_user_services_perms/tasks/dnet-users-data-dirs.yml similarity index 100% rename from dnet_user_services_perms/tasks/dnet-users-data-dirs.yml rename to library/roles/dnet_user_services_perms/tasks/dnet-users-data-dirs.yml diff --git a/dnet_user_services_perms/tasks/main.yml b/library/roles/dnet_user_services_perms/tasks/main.yml similarity index 100% rename from dnet_user_services_perms/tasks/main.yml rename to library/roles/dnet_user_services_perms/tasks/main.yml diff --git a/dnet_user_services_perms/tasks/sudo-config.yml b/library/roles/dnet_user_services_perms/tasks/sudo-config.yml similarity index 100% rename from dnet_user_services_perms/tasks/sudo-config.yml rename to library/roles/dnet_user_services_perms/tasks/sudo-config.yml diff --git a/dnet_user_services_perms/templates/dnet-sudoers.j2 b/library/roles/dnet_user_services_perms/templates/dnet-sudoers.j2 similarity index 100% rename from dnet_user_services_perms/templates/dnet-sudoers.j2 rename to library/roles/dnet_user_services_perms/templates/dnet-sudoers.j2 diff --git a/docker/defaults/main.yml b/library/roles/docker/defaults/main.yml similarity index 100% rename from docker/defaults/main.yml rename to library/roles/docker/defaults/main.yml diff --git a/docker/handlers/main.yml b/library/roles/docker/handlers/main.yml similarity index 100% rename from docker/handlers/main.yml rename to library/roles/docker/handlers/main.yml diff --git a/docker/meta/main.yml b/library/roles/docker/meta/main.yml similarity index 100% rename from docker/meta/main.yml rename to library/roles/docker/meta/main.yml diff --git a/docker/tasks/main.yml b/library/roles/docker/tasks/main.yml similarity index 100% rename from docker/tasks/main.yml rename to library/roles/docker/tasks/main.yml diff --git a/docker/tasks/pkgs.yml b/library/roles/docker/tasks/pkgs.yml similarity index 100% rename from docker/tasks/pkgs.yml rename to library/roles/docker/tasks/pkgs.yml diff --git a/docker/templates/docker-default.j2 b/library/roles/docker/templates/docker-default.j2 similarity index 100% rename from docker/templates/docker-default.j2 rename to library/roles/docker/templates/docker-default.j2 diff --git a/docker/vars/main.yml b/library/roles/docker/vars/main.yml similarity index 100% rename from docker/vars/main.yml rename to library/roles/docker/vars/main.yml diff --git a/drupal-org/defaults/main.yml b/library/roles/drupal-org/defaults/main.yml similarity index 100% rename from drupal-org/defaults/main.yml rename to library/roles/drupal-org/defaults/main.yml diff --git a/drupal-org/meta/main.yml b/library/roles/drupal-org/meta/main.yml similarity index 100% rename from drupal-org/meta/main.yml rename to library/roles/drupal-org/meta/main.yml diff --git a/drupal-org/tasks/drupal-main.yml b/library/roles/drupal-org/tasks/drupal-main.yml similarity index 100% rename from drupal-org/tasks/drupal-main.yml rename to library/roles/drupal-org/tasks/drupal-main.yml diff --git a/drupal-org/tasks/drupal-utility.yml b/library/roles/drupal-org/tasks/drupal-utility.yml similarity index 100% rename from drupal-org/tasks/drupal-utility.yml rename to library/roles/drupal-org/tasks/drupal-utility.yml diff --git a/drupal-org/tasks/drush.yml b/library/roles/drupal-org/tasks/drush.yml similarity index 100% rename from drupal-org/tasks/drush.yml rename to library/roles/drupal-org/tasks/drush.yml diff --git a/drupal-org/tasks/main.yml b/library/roles/drupal-org/tasks/main.yml similarity index 100% rename from drupal-org/tasks/main.yml rename to library/roles/drupal-org/tasks/main.yml diff --git a/drupal-org/templates/drush-global-setup.sh.j2 b/library/roles/drupal-org/templates/drush-global-setup.sh.j2 similarity index 100% rename from drupal-org/templates/drush-global-setup.sh.j2 rename to library/roles/drupal-org/templates/drush-global-setup.sh.j2 diff --git a/egi/occi/defaults/main.yml b/library/roles/egi/occi/defaults/main.yml similarity index 100% rename from egi/occi/defaults/main.yml rename to library/roles/egi/occi/defaults/main.yml diff --git a/egi/occi/tasks/main.yml b/library/roles/egi/occi/tasks/main.yml similarity index 100% rename from egi/occi/tasks/main.yml rename to library/roles/egi/occi/tasks/main.yml diff --git a/egi/voms/defaults/main.yml b/library/roles/egi/voms/defaults/main.yml similarity index 100% rename from egi/voms/defaults/main.yml rename to library/roles/egi/voms/defaults/main.yml diff --git a/egi/voms/tasks/main.yml b/library/roles/egi/voms/tasks/main.yml similarity index 100% rename from egi/voms/tasks/main.yml rename to library/roles/egi/voms/tasks/main.yml diff --git a/egi/voms/templates/gridsecurity-content.j2 b/library/roles/egi/voms/templates/gridsecurity-content.j2 similarity index 100% rename from egi/voms/templates/gridsecurity-content.j2 rename to library/roles/egi/voms/templates/gridsecurity-content.j2 diff --git a/egi/voms/templates/lsc-gridsecurity-content.j2 b/library/roles/egi/voms/templates/lsc-gridsecurity-content.j2 similarity index 100% rename from egi/voms/templates/lsc-gridsecurity-content.j2 rename to library/roles/egi/voms/templates/lsc-gridsecurity-content.j2 diff --git a/egi/voms/templates/voms-data.j2 b/library/roles/egi/voms/templates/voms-data.j2 similarity index 100% rename from egi/voms/templates/voms-data.j2 rename to library/roles/egi/voms/templates/voms-data.j2 diff --git a/fail2ban/defaults/main.yml b/library/roles/fail2ban/defaults/main.yml similarity index 100% rename from fail2ban/defaults/main.yml rename to library/roles/fail2ban/defaults/main.yml diff --git a/fail2ban/handlers/main.yml b/library/roles/fail2ban/handlers/main.yml similarity index 100% rename from fail2ban/handlers/main.yml rename to library/roles/fail2ban/handlers/main.yml diff --git a/fail2ban/tasks/fail2ban-rules.yml b/library/roles/fail2ban/tasks/fail2ban-rules.yml similarity index 100% rename from fail2ban/tasks/fail2ban-rules.yml rename to library/roles/fail2ban/tasks/fail2ban-rules.yml diff --git a/fail2ban/tasks/fail2ban.yml b/library/roles/fail2ban/tasks/fail2ban.yml similarity index 100% rename from fail2ban/tasks/fail2ban.yml rename to library/roles/fail2ban/tasks/fail2ban.yml diff --git a/fail2ban/tasks/main.yml b/library/roles/fail2ban/tasks/main.yml similarity index 100% rename from fail2ban/tasks/main.yml rename to library/roles/fail2ban/tasks/main.yml diff --git a/fail2ban/templates/apache-ddos-filter.conf.j2 b/library/roles/fail2ban/templates/apache-ddos-filter.conf.j2 similarity index 100% rename from fail2ban/templates/apache-ddos-filter.conf.j2 rename to library/roles/fail2ban/templates/apache-ddos-filter.conf.j2 diff --git a/fail2ban/templates/apache-ddos-jail.conf.j2 b/library/roles/fail2ban/templates/apache-ddos-jail.conf.j2 similarity index 100% rename from fail2ban/templates/apache-ddos-jail.conf.j2 rename to library/roles/fail2ban/templates/apache-ddos-jail.conf.j2 diff --git a/fail2ban/templates/jail.local.j2 b/library/roles/fail2ban/templates/jail.local.j2 similarity index 100% rename from fail2ban/templates/jail.local.j2 rename to library/roles/fail2ban/templates/jail.local.j2 diff --git a/fail2ban/templates/nginx-ddos-filter.conf.j2 b/library/roles/fail2ban/templates/nginx-ddos-filter.conf.j2 similarity index 100% rename from fail2ban/templates/nginx-ddos-filter.conf.j2 rename to library/roles/fail2ban/templates/nginx-ddos-filter.conf.j2 diff --git a/fail2ban/templates/nginx-ddos-jail.conf.j2 b/library/roles/fail2ban/templates/nginx-ddos-jail.conf.j2 similarity index 100% rename from fail2ban/templates/nginx-ddos-jail.conf.j2 rename to library/roles/fail2ban/templates/nginx-ddos-jail.conf.j2 diff --git a/foreman/defaults/main.yml b/library/roles/foreman/defaults/main.yml similarity index 100% rename from foreman/defaults/main.yml rename to library/roles/foreman/defaults/main.yml diff --git a/foreman/tasks/foreman-packages.yml b/library/roles/foreman/tasks/foreman-packages.yml similarity index 100% rename from foreman/tasks/foreman-packages.yml rename to library/roles/foreman/tasks/foreman-packages.yml diff --git a/foreman/tasks/main.yml b/library/roles/foreman/tasks/main.yml similarity index 100% rename from foreman/tasks/main.yml rename to library/roles/foreman/tasks/main.yml diff --git a/fusiondirectory/defaults/main.yml b/library/roles/fusiondirectory/defaults/main.yml similarity index 100% rename from fusiondirectory/defaults/main.yml rename to library/roles/fusiondirectory/defaults/main.yml diff --git a/fusiondirectory/tasks/main.yml b/library/roles/fusiondirectory/tasks/main.yml similarity index 100% rename from fusiondirectory/tasks/main.yml rename to library/roles/fusiondirectory/tasks/main.yml diff --git a/fusiondirectory/tasks/manage-fd-packages.yml b/library/roles/fusiondirectory/tasks/manage-fd-packages.yml similarity index 100% rename from fusiondirectory/tasks/manage-fd-packages.yml rename to library/roles/fusiondirectory/tasks/manage-fd-packages.yml diff --git a/fusiondirectory/tasks/manage-fd-repos.yml b/library/roles/fusiondirectory/tasks/manage-fd-repos.yml similarity index 100% rename from fusiondirectory/tasks/manage-fd-repos.yml rename to library/roles/fusiondirectory/tasks/manage-fd-repos.yml diff --git a/fusiondirectory/tasks/manage-fd-schemas.yml b/library/roles/fusiondirectory/tasks/manage-fd-schemas.yml similarity index 100% rename from fusiondirectory/tasks/manage-fd-schemas.yml rename to library/roles/fusiondirectory/tasks/manage-fd-schemas.yml diff --git a/ganglia/defaults/main.yml b/library/roles/ganglia/defaults/main.yml similarity index 100% rename from ganglia/defaults/main.yml rename to library/roles/ganglia/defaults/main.yml diff --git a/ganglia/files/modpython.conf b/library/roles/ganglia/files/modpython.conf similarity index 100% rename from ganglia/files/modpython.conf rename to library/roles/ganglia/files/modpython.conf diff --git a/ganglia/handlers/main.yml b/library/roles/ganglia/handlers/main.yml similarity index 100% rename from ganglia/handlers/main.yml rename to library/roles/ganglia/handlers/main.yml diff --git a/ganglia/tasks/main.yml b/library/roles/ganglia/tasks/main.yml similarity index 100% rename from ganglia/tasks/main.yml rename to library/roles/ganglia/tasks/main.yml diff --git a/ganglia/templates/gmond-2.5.j2 b/library/roles/ganglia/templates/gmond-2.5.j2 similarity index 100% rename from ganglia/templates/gmond-2.5.j2 rename to library/roles/ganglia/templates/gmond-2.5.j2 diff --git a/ganglia/templates/gmond-3.1.j2 b/library/roles/ganglia/templates/gmond-3.1.j2 similarity index 100% rename from ganglia/templates/gmond-3.1.j2 rename to library/roles/ganglia/templates/gmond-3.1.j2 diff --git a/ganglia/templates/gmond.j2 b/library/roles/ganglia/templates/gmond.j2 similarity index 100% rename from ganglia/templates/gmond.j2 rename to library/roles/ganglia/templates/gmond.j2 diff --git a/geonetwork/geonetwork/defaults/main.yml b/library/roles/geonetwork/geonetwork/defaults/main.yml similarity index 100% rename from geonetwork/geonetwork/defaults/main.yml rename to library/roles/geonetwork/geonetwork/defaults/main.yml diff --git a/geonetwork/geonetwork/tasks/main.yml b/library/roles/geonetwork/geonetwork/tasks/main.yml similarity index 100% rename from geonetwork/geonetwork/tasks/main.yml rename to library/roles/geonetwork/geonetwork/tasks/main.yml diff --git a/geonetwork/geonetwork/templates/3.0-config-service-xml-api.xml.j2 b/library/roles/geonetwork/geonetwork/templates/3.0-config-service-xml-api.xml.j2 similarity index 100% rename from geonetwork/geonetwork/templates/3.0-config-service-xml-api.xml.j2 rename to library/roles/geonetwork/geonetwork/templates/3.0-config-service-xml-api.xml.j2 diff --git a/geonetwork/geonetwork/templates/3.0-data-db-default.sql.j2 b/library/roles/geonetwork/geonetwork/templates/3.0-data-db-default.sql.j2 similarity index 100% rename from geonetwork/geonetwork/templates/3.0-data-db-default.sql.j2 rename to library/roles/geonetwork/geonetwork/templates/3.0-data-db-default.sql.j2 diff --git a/geonetwork/geonetwork/templates/3.2-config-service-xml-api.xml.j2 b/library/roles/geonetwork/geonetwork/templates/3.2-config-service-xml-api.xml.j2 similarity index 100% rename from geonetwork/geonetwork/templates/3.2-config-service-xml-api.xml.j2 rename to library/roles/geonetwork/geonetwork/templates/3.2-config-service-xml-api.xml.j2 diff --git a/geonetwork/geonetwork/templates/3.2-data-db-default.sql.j2 b/library/roles/geonetwork/geonetwork/templates/3.2-data-db-default.sql.j2 similarity index 100% rename from geonetwork/geonetwork/templates/3.2-data-db-default.sql.j2 rename to library/roles/geonetwork/geonetwork/templates/3.2-data-db-default.sql.j2 diff --git a/geonetwork/geonetwork/templates/3.2-web.xml.j2 b/library/roles/geonetwork/geonetwork/templates/3.2-web.xml.j2 similarity index 100% rename from geonetwork/geonetwork/templates/3.2-web.xml.j2 rename to library/roles/geonetwork/geonetwork/templates/3.2-web.xml.j2 diff --git a/geonetwork/geonetwork/templates/geonetwork_config.xml.j2 b/library/roles/geonetwork/geonetwork/templates/geonetwork_config.xml.j2 similarity index 100% rename from geonetwork/geonetwork/templates/geonetwork_config.xml.j2 rename to library/roles/geonetwork/geonetwork/templates/geonetwork_config.xml.j2 diff --git a/geonetwork/geonetwork/templates/jdbc.properties.j2 b/library/roles/geonetwork/geonetwork/templates/jdbc.properties.j2 similarity index 100% rename from geonetwork/geonetwork/templates/jdbc.properties.j2 rename to library/roles/geonetwork/geonetwork/templates/jdbc.properties.j2 diff --git a/geonetwork/geonetwork/templates/srv.xml.j2 b/library/roles/geonetwork/geonetwork/templates/srv.xml.j2 similarity index 100% rename from geonetwork/geonetwork/templates/srv.xml.j2 rename to library/roles/geonetwork/geonetwork/templates/srv.xml.j2 diff --git a/geoserver/geoserver/defaults/main.yml b/library/roles/geoserver/geoserver/defaults/main.yml similarity index 100% rename from geoserver/geoserver/defaults/main.yml rename to library/roles/geoserver/geoserver/defaults/main.yml diff --git a/geoserver/geoserver/tasks/geoserver.yml b/library/roles/geoserver/geoserver/tasks/geoserver.yml similarity index 100% rename from geoserver/geoserver/tasks/geoserver.yml rename to library/roles/geoserver/geoserver/tasks/geoserver.yml diff --git a/geoserver/geoserver/tasks/main.yml b/library/roles/geoserver/geoserver/tasks/main.yml similarity index 100% rename from geoserver/geoserver/tasks/main.yml rename to library/roles/geoserver/geoserver/tasks/main.yml diff --git a/geoserver/mapproxy/defaults/main.yml b/library/roles/geoserver/mapproxy/defaults/main.yml similarity index 100% rename from geoserver/mapproxy/defaults/main.yml rename to library/roles/geoserver/mapproxy/defaults/main.yml diff --git a/geoserver/mapproxy/handlers/main.yml b/library/roles/geoserver/mapproxy/handlers/main.yml similarity index 100% rename from geoserver/mapproxy/handlers/main.yml rename to library/roles/geoserver/mapproxy/handlers/main.yml diff --git a/geoserver/mapproxy/tasks/main.yml b/library/roles/geoserver/mapproxy/tasks/main.yml similarity index 100% rename from geoserver/mapproxy/tasks/main.yml rename to library/roles/geoserver/mapproxy/tasks/main.yml diff --git a/geoserver/spatialite/defaults/main.yml b/library/roles/geoserver/spatialite/defaults/main.yml similarity index 100% rename from geoserver/spatialite/defaults/main.yml rename to library/roles/geoserver/spatialite/defaults/main.yml diff --git a/geoserver/spatialite/tasks/main.yml b/library/roles/geoserver/spatialite/tasks/main.yml similarity index 100% rename from geoserver/spatialite/tasks/main.yml rename to library/roles/geoserver/spatialite/tasks/main.yml diff --git a/gerrit/defaults/main.yml b/library/roles/gerrit/defaults/main.yml similarity index 100% rename from gerrit/defaults/main.yml rename to library/roles/gerrit/defaults/main.yml diff --git a/gerrit/files/gerrit.sh b/library/roles/gerrit/files/gerrit.sh similarity index 100% rename from gerrit/files/gerrit.sh rename to library/roles/gerrit/files/gerrit.sh diff --git a/gerrit/tasks/main.yml b/library/roles/gerrit/tasks/main.yml similarity index 100% rename from gerrit/tasks/main.yml rename to library/roles/gerrit/tasks/main.yml diff --git a/gerrit/templates/gerrit.config.j2 b/library/roles/gerrit/templates/gerrit.config.j2 similarity index 100% rename from gerrit/templates/gerrit.config.j2 rename to library/roles/gerrit/templates/gerrit.config.j2 diff --git a/gerrit/templates/gerritcodereview.default.j2 b/library/roles/gerrit/templates/gerritcodereview.default.j2 similarity index 100% rename from gerrit/templates/gerritcodereview.default.j2 rename to library/roles/gerrit/templates/gerritcodereview.default.j2 diff --git a/gitblit/defaults/main.yml b/library/roles/gitblit/defaults/main.yml similarity index 100% rename from gitblit/defaults/main.yml rename to library/roles/gitblit/defaults/main.yml diff --git a/gitblit/files/service-ubuntu.sh b/library/roles/gitblit/files/service-ubuntu.sh similarity index 100% rename from gitblit/files/service-ubuntu.sh rename to library/roles/gitblit/files/service-ubuntu.sh diff --git a/gitblit/handlers/main.yml b/library/roles/gitblit/handlers/main.yml similarity index 100% rename from gitblit/handlers/main.yml rename to library/roles/gitblit/handlers/main.yml diff --git a/gitblit/tasks/main.yml b/library/roles/gitblit/tasks/main.yml similarity index 100% rename from gitblit/tasks/main.yml rename to library/roles/gitblit/tasks/main.yml diff --git a/gitblit/templates/gitblit-default.j2 b/library/roles/gitblit/templates/gitblit-default.j2 similarity index 100% rename from gitblit/templates/gitblit-default.j2 rename to library/roles/gitblit/templates/gitblit-default.j2 diff --git a/gitblit/templates/gitblit.properties.j2 b/library/roles/gitblit/templates/gitblit.properties.j2 similarity index 100% rename from gitblit/templates/gitblit.properties.j2 rename to library/roles/gitblit/templates/gitblit.properties.j2 diff --git a/gitea/defaults/main.yml b/library/roles/gitea/defaults/main.yml similarity index 100% rename from gitea/defaults/main.yml rename to library/roles/gitea/defaults/main.yml diff --git a/gitea/handlers/main.yml b/library/roles/gitea/handlers/main.yml similarity index 100% rename from gitea/handlers/main.yml rename to library/roles/gitea/handlers/main.yml diff --git a/gitea/meta/main.yml b/library/roles/gitea/meta/main.yml similarity index 100% rename from gitea/meta/main.yml rename to library/roles/gitea/meta/main.yml diff --git a/gitea/tasks/main.yml b/library/roles/gitea/tasks/main.yml similarity index 100% rename from gitea/tasks/main.yml rename to library/roles/gitea/tasks/main.yml diff --git a/gitea/templates/app.ini.j2 b/library/roles/gitea/templates/app.ini.j2 similarity index 100% rename from gitea/templates/app.ini.j2 rename to library/roles/gitea/templates/app.ini.j2 diff --git a/gitea/templates/gitea.service.systemd b/library/roles/gitea/templates/gitea.service.systemd similarity index 100% rename from gitea/templates/gitea.service.systemd rename to library/roles/gitea/templates/gitea.service.systemd diff --git a/gitea/vars/main.yml b/library/roles/gitea/vars/main.yml similarity index 100% rename from gitea/vars/main.yml rename to library/roles/gitea/vars/main.yml diff --git a/google-openrefine/defaults/main.yml b/library/roles/google-openrefine/defaults/main.yml similarity index 100% rename from google-openrefine/defaults/main.yml rename to library/roles/google-openrefine/defaults/main.yml diff --git a/google-openrefine/handlers/main.yml b/library/roles/google-openrefine/handlers/main.yml similarity index 100% rename from google-openrefine/handlers/main.yml rename to library/roles/google-openrefine/handlers/main.yml diff --git a/google-openrefine/tasks/main.yml b/library/roles/google-openrefine/tasks/main.yml similarity index 100% rename from google-openrefine/tasks/main.yml rename to library/roles/google-openrefine/tasks/main.yml diff --git a/google-openrefine/templates/openrefine.conf.j2 b/library/roles/google-openrefine/templates/openrefine.conf.j2 similarity index 100% rename from google-openrefine/templates/openrefine.conf.j2 rename to library/roles/google-openrefine/templates/openrefine.conf.j2 diff --git a/google-openrefine/templates/refine.ini b/library/roles/google-openrefine/templates/refine.ini similarity index 100% rename from google-openrefine/templates/refine.ini rename to library/roles/google-openrefine/templates/refine.ini diff --git a/grafana/defaults/main.yml b/library/roles/grafana/defaults/main.yml similarity index 100% rename from grafana/defaults/main.yml rename to library/roles/grafana/defaults/main.yml diff --git a/grafana/handlers/main.yml b/library/roles/grafana/handlers/main.yml similarity index 100% rename from grafana/handlers/main.yml rename to library/roles/grafana/handlers/main.yml diff --git a/grafana/meta/main.yml b/library/roles/grafana/meta/main.yml similarity index 100% rename from grafana/meta/main.yml rename to library/roles/grafana/meta/main.yml diff --git a/grafana/tasks/main.yml b/library/roles/grafana/tasks/main.yml similarity index 100% rename from grafana/tasks/main.yml rename to library/roles/grafana/tasks/main.yml diff --git a/grafana/templates/grafana.ini.j2 b/library/roles/grafana/templates/grafana.ini.j2 similarity index 100% rename from grafana/templates/grafana.ini.j2 rename to library/roles/grafana/templates/grafana.ini.j2 diff --git a/grafana/templates/ldap.toml.j2 b/library/roles/grafana/templates/ldap.toml.j2 similarity index 100% rename from grafana/templates/ldap.toml.j2 rename to library/roles/grafana/templates/ldap.toml.j2 diff --git a/grafana/vars/main.yml b/library/roles/grafana/vars/main.yml similarity index 100% rename from grafana/vars/main.yml rename to library/roles/grafana/vars/main.yml diff --git a/hadoop/CDH/defaults/main.yml b/library/roles/hadoop/CDH/defaults/main.yml similarity index 100% rename from hadoop/CDH/defaults/main.yml rename to library/roles/hadoop/CDH/defaults/main.yml diff --git a/hadoop/CDH/handlers/main.yml b/library/roles/hadoop/CDH/handlers/main.yml similarity index 100% rename from hadoop/CDH/handlers/main.yml rename to library/roles/hadoop/CDH/handlers/main.yml diff --git a/hadoop/CDH/meta/main.yml b/library/roles/hadoop/CDH/meta/main.yml similarity index 100% rename from hadoop/CDH/meta/main.yml rename to library/roles/hadoop/CDH/meta/main.yml diff --git a/hadoop/CDH/tasks/cdm.yml b/library/roles/hadoop/CDH/tasks/cdm.yml similarity index 100% rename from hadoop/CDH/tasks/cdm.yml rename to library/roles/hadoop/CDH/tasks/cdm.yml diff --git a/hadoop/CDH/tasks/main.yml b/library/roles/hadoop/CDH/tasks/main.yml similarity index 100% rename from hadoop/CDH/tasks/main.yml rename to library/roles/hadoop/CDH/tasks/main.yml diff --git a/hadoop/CDH/tasks/oozie.yml b/library/roles/hadoop/CDH/tasks/oozie.yml similarity index 100% rename from hadoop/CDH/tasks/oozie.yml rename to library/roles/hadoop/CDH/tasks/oozie.yml diff --git a/hadoop/CDH/tasks/services-haproxy.yml b/library/roles/hadoop/CDH/tasks/services-haproxy.yml similarity index 100% rename from hadoop/CDH/tasks/services-haproxy.yml rename to library/roles/hadoop/CDH/tasks/services-haproxy.yml diff --git a/hadoop/CDH/tasks/spark2.yml b/library/roles/hadoop/CDH/tasks/spark2.yml similarity index 100% rename from hadoop/CDH/tasks/spark2.yml rename to library/roles/hadoop/CDH/tasks/spark2.yml diff --git a/hadoop/CDH/tasks/zeppelin.yml b/library/roles/hadoop/CDH/tasks/zeppelin.yml similarity index 100% rename from hadoop/CDH/tasks/zeppelin.yml rename to library/roles/hadoop/CDH/tasks/zeppelin.yml diff --git a/hadoop/CDH/templates/db.properties.j2 b/library/roles/hadoop/CDH/templates/db.properties.j2 similarity index 100% rename from hadoop/CDH/templates/db.properties.j2 rename to library/roles/hadoop/CDH/templates/db.properties.j2 diff --git a/hadoop/CDH/templates/hue-hive-impala_haproxy.cfg b/library/roles/hadoop/CDH/templates/hue-hive-impala_haproxy.cfg similarity index 100% rename from hadoop/CDH/templates/hue-hive-impala_haproxy.cfg rename to library/roles/hadoop/CDH/templates/hue-hive-impala_haproxy.cfg diff --git a/hadoop/CDH/templates/shiro.ini b/library/roles/hadoop/CDH/templates/shiro.ini similarity index 100% rename from hadoop/CDH/templates/shiro.ini rename to library/roles/hadoop/CDH/templates/shiro.ini diff --git a/hadoop/CDH/templates/zeppelin-env.sh b/library/roles/hadoop/CDH/templates/zeppelin-env.sh similarity index 100% rename from hadoop/CDH/templates/zeppelin-env.sh rename to library/roles/hadoop/CDH/templates/zeppelin-env.sh diff --git a/hadoop/CDH/templates/zeppelin-site.xml b/library/roles/hadoop/CDH/templates/zeppelin-site.xml similarity index 100% rename from hadoop/CDH/templates/zeppelin-site.xml rename to library/roles/hadoop/CDH/templates/zeppelin-site.xml diff --git a/hadoop/CDH/templates/zeppelin_systemd.service b/library/roles/hadoop/CDH/templates/zeppelin_systemd.service similarity index 100% rename from hadoop/CDH/templates/zeppelin_systemd.service rename to library/roles/hadoop/CDH/templates/zeppelin_systemd.service diff --git a/hadoop/CDH/templates/zeppelin_upstart.conf b/library/roles/hadoop/CDH/templates/zeppelin_upstart.conf similarity index 100% rename from hadoop/CDH/templates/zeppelin_upstart.conf rename to library/roles/hadoop/CDH/templates/zeppelin_upstart.conf diff --git a/hadoop/HDP/defaults/main.yml b/library/roles/hadoop/HDP/defaults/main.yml similarity index 100% rename from hadoop/HDP/defaults/main.yml rename to library/roles/hadoop/HDP/defaults/main.yml diff --git a/hadoop/HDP/tasks/main.yml b/library/roles/hadoop/HDP/tasks/main.yml similarity index 100% rename from hadoop/HDP/tasks/main.yml rename to library/roles/hadoop/HDP/tasks/main.yml diff --git a/haproxy/README b/library/roles/haproxy/README similarity index 100% rename from haproxy/README rename to library/roles/haproxy/README diff --git a/haproxy/defaults/main.yml b/library/roles/haproxy/defaults/main.yml similarity index 100% rename from haproxy/defaults/main.yml rename to library/roles/haproxy/defaults/main.yml diff --git a/haproxy/files/check_haproxy_stats b/library/roles/haproxy/files/check_haproxy_stats similarity index 100% rename from haproxy/files/check_haproxy_stats rename to library/roles/haproxy/files/check_haproxy_stats diff --git a/haproxy/files/haproxy-letsencrypt.sh b/library/roles/haproxy/files/haproxy-letsencrypt.sh similarity index 100% rename from haproxy/files/haproxy-letsencrypt.sh rename to library/roles/haproxy/files/haproxy-letsencrypt.sh diff --git a/haproxy/handlers/main.yml b/library/roles/haproxy/handlers/main.yml similarity index 100% rename from haproxy/handlers/main.yml rename to library/roles/haproxy/handlers/main.yml diff --git a/haproxy/tasks/haproxy-letsencrypt-acme-sh.yml b/library/roles/haproxy/tasks/haproxy-letsencrypt-acme-sh.yml similarity index 100% rename from haproxy/tasks/haproxy-letsencrypt-acme-sh.yml rename to library/roles/haproxy/tasks/haproxy-letsencrypt-acme-sh.yml diff --git a/haproxy/tasks/haproxy-letsencrypt-acmetool.yml b/library/roles/haproxy/tasks/haproxy-letsencrypt-acmetool.yml similarity index 100% rename from haproxy/tasks/haproxy-letsencrypt-acmetool.yml rename to library/roles/haproxy/tasks/haproxy-letsencrypt-acmetool.yml diff --git a/haproxy/tasks/haproxy-nagios.yml b/library/roles/haproxy/tasks/haproxy-nagios.yml similarity index 100% rename from haproxy/tasks/haproxy-nagios.yml rename to library/roles/haproxy/tasks/haproxy-nagios.yml diff --git a/haproxy/tasks/haproxy-service.yml b/library/roles/haproxy/tasks/haproxy-service.yml similarity index 100% rename from haproxy/tasks/haproxy-service.yml rename to library/roles/haproxy/tasks/haproxy-service.yml diff --git a/haproxy/tasks/haproxy-ssl.yml b/library/roles/haproxy/tasks/haproxy-ssl.yml similarity index 100% rename from haproxy/tasks/haproxy-ssl.yml rename to library/roles/haproxy/tasks/haproxy-ssl.yml diff --git a/haproxy/tasks/main.yml b/library/roles/haproxy/tasks/main.yml similarity index 100% rename from haproxy/tasks/main.yml rename to library/roles/haproxy/tasks/main.yml diff --git a/haproxy/templates/hapos-upd.j2 b/library/roles/haproxy/templates/hapos-upd.j2 similarity index 100% rename from haproxy/templates/hapos-upd.j2 rename to library/roles/haproxy/templates/hapos-upd.j2 diff --git a/haproxy/templates/haproxy-letsencrypt-acme.sh.j2 b/library/roles/haproxy/templates/haproxy-letsencrypt-acme.sh.j2 similarity index 100% rename from haproxy/templates/haproxy-letsencrypt-acme.sh.j2 rename to library/roles/haproxy/templates/haproxy-letsencrypt-acme.sh.j2 diff --git a/haproxy/templates/lb.cfg.j2 b/library/roles/haproxy/templates/lb.cfg.j2 similarity index 100% rename from haproxy/templates/lb.cfg.j2 rename to library/roles/haproxy/templates/lb.cfg.j2 diff --git a/hdf5/defaults/main.yml b/library/roles/hdf5/defaults/main.yml similarity index 100% rename from hdf5/defaults/main.yml rename to library/roles/hdf5/defaults/main.yml diff --git a/hdf5/tasks/main.yml b/library/roles/hdf5/tasks/main.yml similarity index 100% rename from hdf5/tasks/main.yml rename to library/roles/hdf5/tasks/main.yml diff --git a/ipa-server/defaults/main.yml b/library/roles/ipa-server/defaults/main.yml similarity index 100% rename from ipa-server/defaults/main.yml rename to library/roles/ipa-server/defaults/main.yml diff --git a/ipa-server/files/lets-encrypt-x3-cross-signed.pem b/library/roles/ipa-server/files/lets-encrypt-x3-cross-signed.pem similarity index 100% rename from ipa-server/files/lets-encrypt-x3-cross-signed.pem rename to library/roles/ipa-server/files/lets-encrypt-x3-cross-signed.pem diff --git a/ipa-server/handlers/main.yml b/library/roles/ipa-server/handlers/main.yml similarity index 100% rename from ipa-server/handlers/main.yml rename to library/roles/ipa-server/handlers/main.yml diff --git a/ipa-server/tasks/main.yml b/library/roles/ipa-server/tasks/main.yml similarity index 100% rename from ipa-server/tasks/main.yml rename to library/roles/ipa-server/tasks/main.yml diff --git a/ipa-server/templates/ipa-letsencrypt-acmetool.sh b/library/roles/ipa-server/templates/ipa-letsencrypt-acmetool.sh similarity index 100% rename from ipa-server/templates/ipa-letsencrypt-acmetool.sh rename to library/roles/ipa-server/templates/ipa-letsencrypt-acmetool.sh diff --git a/ipa-server/templates/letsencrypt-proxy.conf.j2 b/library/roles/ipa-server/templates/letsencrypt-proxy.conf.j2 similarity index 100% rename from ipa-server/templates/letsencrypt-proxy.conf.j2 rename to library/roles/ipa-server/templates/letsencrypt-proxy.conf.j2 diff --git a/iptables/defaults/main.yml b/library/roles/iptables/defaults/main.yml similarity index 100% rename from iptables/defaults/main.yml rename to library/roles/iptables/defaults/main.yml diff --git a/iptables/handlers/main.yml b/library/roles/iptables/handlers/main.yml similarity index 100% rename from iptables/handlers/main.yml rename to library/roles/iptables/handlers/main.yml diff --git a/iptables/meta/main.yml b/library/roles/iptables/meta/main.yml similarity index 100% rename from iptables/meta/main.yml rename to library/roles/iptables/meta/main.yml diff --git a/iptables/tasks/main.yml b/library/roles/iptables/tasks/main.yml similarity index 100% rename from iptables/tasks/main.yml rename to library/roles/iptables/tasks/main.yml diff --git a/iptables/templates/iptables-rules.v4.j2 b/library/roles/iptables/templates/iptables-rules.v4.j2 similarity index 100% rename from iptables/templates/iptables-rules.v4.j2 rename to library/roles/iptables/templates/iptables-rules.v4.j2 diff --git a/iptables/templates/iptables-rules.v6.j2 b/library/roles/iptables/templates/iptables-rules.v6.j2 similarity index 100% rename from iptables/templates/iptables-rules.v6.j2 rename to library/roles/iptables/templates/iptables-rules.v6.j2 diff --git a/java-keyring/defaults/main.yml b/library/roles/java-keyring/defaults/main.yml similarity index 100% rename from java-keyring/defaults/main.yml rename to library/roles/java-keyring/defaults/main.yml diff --git a/java-keyring/tasks/main.yml b/library/roles/java-keyring/tasks/main.yml similarity index 100% rename from java-keyring/tasks/main.yml rename to library/roles/java-keyring/tasks/main.yml diff --git a/jenkins/common/defaults/main.yml b/library/roles/jenkins/common/defaults/main.yml similarity index 100% rename from jenkins/common/defaults/main.yml rename to library/roles/jenkins/common/defaults/main.yml diff --git a/jenkins/common/tasks/main.yml b/library/roles/jenkins/common/tasks/main.yml similarity index 100% rename from jenkins/common/tasks/main.yml rename to library/roles/jenkins/common/tasks/main.yml diff --git a/jenkins/master/defaults/main.yml b/library/roles/jenkins/master/defaults/main.yml similarity index 100% rename from jenkins/master/defaults/main.yml rename to library/roles/jenkins/master/defaults/main.yml diff --git a/jenkins/master/files/sbt-launch-0.11.0.jar b/library/roles/jenkins/master/files/sbt-launch-0.11.0.jar similarity index 100% rename from jenkins/master/files/sbt-launch-0.11.0.jar rename to library/roles/jenkins/master/files/sbt-launch-0.11.0.jar diff --git a/jenkins/master/files/sbt-launch-0.12.jar b/library/roles/jenkins/master/files/sbt-launch-0.12.jar similarity index 100% rename from jenkins/master/files/sbt-launch-0.12.jar rename to library/roles/jenkins/master/files/sbt-launch-0.12.jar diff --git a/jenkins/master/files/sbt-launch-0.13.13.jar b/library/roles/jenkins/master/files/sbt-launch-0.13.13.jar similarity index 100% rename from jenkins/master/files/sbt-launch-0.13.13.jar rename to library/roles/jenkins/master/files/sbt-launch-0.13.13.jar diff --git a/jenkins/master/handlers/main.yml b/library/roles/jenkins/master/handlers/main.yml similarity index 100% rename from jenkins/master/handlers/main.yml rename to library/roles/jenkins/master/handlers/main.yml diff --git a/jenkins/master/tasks/jenkins_deb_pkgs.yml b/library/roles/jenkins/master/tasks/jenkins_deb_pkgs.yml similarity index 100% rename from jenkins/master/tasks/jenkins_deb_pkgs.yml rename to library/roles/jenkins/master/tasks/jenkins_deb_pkgs.yml diff --git a/jenkins/master/tasks/jenkins_init.yml b/library/roles/jenkins/master/tasks/jenkins_init.yml similarity index 100% rename from jenkins/master/tasks/jenkins_init.yml rename to library/roles/jenkins/master/tasks/jenkins_init.yml diff --git a/jenkins/master/tasks/jenkins_plugins.yml b/library/roles/jenkins/master/tasks/jenkins_plugins.yml similarity index 100% rename from jenkins/master/tasks/jenkins_plugins.yml rename to library/roles/jenkins/master/tasks/jenkins_plugins.yml diff --git a/jenkins/master/tasks/jenkins_rh_pkgs.yml b/library/roles/jenkins/master/tasks/jenkins_rh_pkgs.yml similarity index 100% rename from jenkins/master/tasks/jenkins_rh_pkgs.yml rename to library/roles/jenkins/master/tasks/jenkins_rh_pkgs.yml diff --git a/jenkins/master/tasks/main.yml b/library/roles/jenkins/master/tasks/main.yml similarity index 100% rename from jenkins/master/tasks/main.yml rename to library/roles/jenkins/master/tasks/main.yml diff --git a/jenkins/master/templates/admin_user.groovy b/library/roles/jenkins/master/templates/admin_user.groovy similarity index 100% rename from jenkins/master/templates/admin_user.groovy rename to library/roles/jenkins/master/templates/admin_user.groovy diff --git a/jenkins/master/templates/jenkins.default.j2 b/library/roles/jenkins/master/templates/jenkins.default.j2 similarity index 100% rename from jenkins/master/templates/jenkins.default.j2 rename to library/roles/jenkins/master/templates/jenkins.default.j2 diff --git a/jenkins/slave/defaults/main.yml b/library/roles/jenkins/slave/defaults/main.yml similarity index 100% rename from jenkins/slave/defaults/main.yml rename to library/roles/jenkins/slave/defaults/main.yml diff --git a/jenkins/slave/handlers/main.yml b/library/roles/jenkins/slave/handlers/main.yml similarity index 100% rename from jenkins/slave/handlers/main.yml rename to library/roles/jenkins/slave/handlers/main.yml diff --git a/jenkins/slave/tasks/main.yml b/library/roles/jenkins/slave/tasks/main.yml similarity index 100% rename from jenkins/slave/tasks/main.yml rename to library/roles/jenkins/slave/tasks/main.yml diff --git a/jenkins/slave/templates/tmp-cleaner.j2 b/library/roles/jenkins/slave/templates/tmp-cleaner.j2 similarity index 100% rename from jenkins/slave/templates/tmp-cleaner.j2 rename to library/roles/jenkins/slave/templates/tmp-cleaner.j2 diff --git a/jetty-apache/defaults/main.yml b/library/roles/jetty-apache/defaults/main.yml similarity index 100% rename from jetty-apache/defaults/main.yml rename to library/roles/jetty-apache/defaults/main.yml diff --git a/jetty-apache/handlers/main.yml b/library/roles/jetty-apache/handlers/main.yml similarity index 100% rename from jetty-apache/handlers/main.yml rename to library/roles/jetty-apache/handlers/main.yml diff --git a/jetty-apache/tasks/apache.yml b/library/roles/jetty-apache/tasks/apache.yml similarity index 100% rename from jetty-apache/tasks/apache.yml rename to library/roles/jetty-apache/tasks/apache.yml diff --git a/jetty-apache/tasks/jetty.yml b/library/roles/jetty-apache/tasks/jetty.yml similarity index 100% rename from jetty-apache/tasks/jetty.yml rename to library/roles/jetty-apache/tasks/jetty.yml diff --git a/jetty-apache/tasks/main.yml b/library/roles/jetty-apache/tasks/main.yml similarity index 100% rename from jetty-apache/tasks/main.yml rename to library/roles/jetty-apache/tasks/main.yml diff --git a/jetty-apache/templates/jetty-defaults.j2 b/library/roles/jetty-apache/templates/jetty-defaults.j2 similarity index 100% rename from jetty-apache/templates/jetty-defaults.j2 rename to library/roles/jetty-apache/templates/jetty-defaults.j2 diff --git a/jetty-apache/templates/jetty-limits.conf.j2 b/library/roles/jetty-apache/templates/jetty-limits.conf.j2 similarity index 100% rename from jetty-apache/templates/jetty-limits.conf.j2 rename to library/roles/jetty-apache/templates/jetty-limits.conf.j2 diff --git a/jetty-apache/templates/jetty-setuid.xml.j2 b/library/roles/jetty-apache/templates/jetty-setuid.xml.j2 similarity index 100% rename from jetty-apache/templates/jetty-setuid.xml.j2 rename to library/roles/jetty-apache/templates/jetty-setuid.xml.j2 diff --git a/jetty/defaults/main.yml b/library/roles/jetty/defaults/main.yml similarity index 100% rename from jetty/defaults/main.yml rename to library/roles/jetty/defaults/main.yml diff --git a/jetty/handlers/main.yml b/library/roles/jetty/handlers/main.yml similarity index 100% rename from jetty/handlers/main.yml rename to library/roles/jetty/handlers/main.yml diff --git a/jetty/tasks/jetty.yml b/library/roles/jetty/tasks/jetty.yml similarity index 100% rename from jetty/tasks/jetty.yml rename to library/roles/jetty/tasks/jetty.yml diff --git a/jetty/tasks/main.yml b/library/roles/jetty/tasks/main.yml similarity index 100% rename from jetty/tasks/main.yml rename to library/roles/jetty/tasks/main.yml diff --git a/jetty/templates/jetty-defaults.j2 b/library/roles/jetty/templates/jetty-defaults.j2 similarity index 100% rename from jetty/templates/jetty-defaults.j2 rename to library/roles/jetty/templates/jetty-defaults.j2 diff --git a/jetty/templates/jetty-limits.conf.j2 b/library/roles/jetty/templates/jetty-limits.conf.j2 similarity index 100% rename from jetty/templates/jetty-limits.conf.j2 rename to library/roles/jetty/templates/jetty-limits.conf.j2 diff --git a/jetty/templates/jetty-setuid.xml.j2 b/library/roles/jetty/templates/jetty-setuid.xml.j2 similarity index 100% rename from jetty/templates/jetty-setuid.xml.j2 rename to library/roles/jetty/templates/jetty-setuid.xml.j2 diff --git a/joomla-org/defaults/main.yml b/library/roles/joomla-org/defaults/main.yml similarity index 100% rename from joomla-org/defaults/main.yml rename to library/roles/joomla-org/defaults/main.yml diff --git a/joomla-org/tasks/main.yml b/library/roles/joomla-org/tasks/main.yml similarity index 100% rename from joomla-org/tasks/main.yml rename to library/roles/joomla-org/tasks/main.yml diff --git a/keepalived/defaults/main.yml b/library/roles/keepalived/defaults/main.yml similarity index 100% rename from keepalived/defaults/main.yml rename to library/roles/keepalived/defaults/main.yml diff --git a/keepalived/files/check_keepalived_state b/library/roles/keepalived/files/check_keepalived_state similarity index 100% rename from keepalived/files/check_keepalived_state rename to library/roles/keepalived/files/check_keepalived_state diff --git a/keepalived/handlers/main.yml b/library/roles/keepalived/handlers/main.yml similarity index 100% rename from keepalived/handlers/main.yml rename to library/roles/keepalived/handlers/main.yml diff --git a/keepalived/tasks/main.yml b/library/roles/keepalived/tasks/main.yml similarity index 100% rename from keepalived/tasks/main.yml rename to library/roles/keepalived/tasks/main.yml diff --git a/keepalived/templates/keepalived-nrpe.cfg.j2 b/library/roles/keepalived/templates/keepalived-nrpe.cfg.j2 similarity index 100% rename from keepalived/templates/keepalived-nrpe.cfg.j2 rename to library/roles/keepalived/templates/keepalived-nrpe.cfg.j2 diff --git a/keepalived/templates/keepalived.conf.j2 b/library/roles/keepalived/templates/keepalived.conf.j2 similarity index 100% rename from keepalived/templates/keepalived.conf.j2 rename to library/roles/keepalived/templates/keepalived.conf.j2 diff --git a/keepalived/templates/keepalived_notify.sh.j2 b/library/roles/keepalived/templates/keepalived_notify.sh.j2 similarity index 100% rename from keepalived/templates/keepalived_notify.sh.j2 rename to library/roles/keepalived/templates/keepalived_notify.sh.j2 diff --git a/ldap-client-config/defaults/main.yml b/library/roles/ldap-client-config/defaults/main.yml similarity index 100% rename from ldap-client-config/defaults/main.yml rename to library/roles/ldap-client-config/defaults/main.yml diff --git a/ldap-client-config/tasks/main.yml b/library/roles/ldap-client-config/tasks/main.yml similarity index 100% rename from ldap-client-config/tasks/main.yml rename to library/roles/ldap-client-config/tasks/main.yml diff --git a/ldap-client-config/templates/ldap.conf-old.j2 b/library/roles/ldap-client-config/templates/ldap.conf-old.j2 similarity index 100% rename from ldap-client-config/templates/ldap.conf-old.j2 rename to library/roles/ldap-client-config/templates/ldap.conf-old.j2 diff --git a/ldap-client-config/templates/ldap.conf.j2 b/library/roles/ldap-client-config/templates/ldap.conf.j2 similarity index 100% rename from ldap-client-config/templates/ldap.conf.j2 rename to library/roles/ldap-client-config/templates/ldap.conf.j2 diff --git a/letsencrypt-acme-sh-client/defaults/main.yml b/library/roles/letsencrypt-acme-sh-client/defaults/main.yml similarity index 100% rename from letsencrypt-acme-sh-client/defaults/main.yml rename to library/roles/letsencrypt-acme-sh-client/defaults/main.yml diff --git a/letsencrypt-acme-sh-client/files/acme-sh-cron-command b/library/roles/letsencrypt-acme-sh-client/files/acme-sh-cron-command similarity index 100% rename from letsencrypt-acme-sh-client/files/acme-sh-cron-command rename to library/roles/letsencrypt-acme-sh-client/files/acme-sh-cron-command diff --git a/letsencrypt-acme-sh-client/files/acme-sh-cron-script b/library/roles/letsencrypt-acme-sh-client/files/acme-sh-cron-script similarity index 100% rename from letsencrypt-acme-sh-client/files/acme-sh-cron-script rename to library/roles/letsencrypt-acme-sh-client/files/acme-sh-cron-script diff --git a/letsencrypt-acme-sh-client/files/acme-sh-install b/library/roles/letsencrypt-acme-sh-client/files/acme-sh-install similarity index 100% rename from letsencrypt-acme-sh-client/files/acme-sh-install rename to library/roles/letsencrypt-acme-sh-client/files/acme-sh-install diff --git a/letsencrypt-acme-sh-client/files/acme-sh-install-certs b/library/roles/letsencrypt-acme-sh-client/files/acme-sh-install-certs similarity index 100% rename from letsencrypt-acme-sh-client/files/acme-sh-install-certs rename to library/roles/letsencrypt-acme-sh-client/files/acme-sh-install-certs diff --git a/letsencrypt-acme-sh-client/files/acme-sh-request-cert b/library/roles/letsencrypt-acme-sh-client/files/acme-sh-request-cert similarity index 100% rename from letsencrypt-acme-sh-client/files/acme-sh-request-cert rename to library/roles/letsencrypt-acme-sh-client/files/acme-sh-request-cert diff --git a/letsencrypt-acme-sh-client/handlers/main.yml b/library/roles/letsencrypt-acme-sh-client/handlers/main.yml similarity index 100% rename from letsencrypt-acme-sh-client/handlers/main.yml rename to library/roles/letsencrypt-acme-sh-client/handlers/main.yml diff --git a/letsencrypt-acme-sh-client/tasks/main.yml b/library/roles/letsencrypt-acme-sh-client/tasks/main.yml similarity index 100% rename from letsencrypt-acme-sh-client/tasks/main.yml rename to library/roles/letsencrypt-acme-sh-client/tasks/main.yml diff --git a/letsencrypt-acme-sh-client/templates/account.conf.j2 b/library/roles/letsencrypt-acme-sh-client/templates/account.conf.j2 similarity index 100% rename from letsencrypt-acme-sh-client/templates/account.conf.j2 rename to library/roles/letsencrypt-acme-sh-client/templates/account.conf.j2 diff --git a/letsencrypt-acme-sh-client/templates/acme_sh_request_env.j2 b/library/roles/letsencrypt-acme-sh-client/templates/acme_sh_request_env.j2 similarity index 100% rename from letsencrypt-acme-sh-client/templates/acme_sh_request_env.j2 rename to library/roles/letsencrypt-acme-sh-client/templates/acme_sh_request_env.j2 diff --git a/letsencrypt-acmetool-client/defaults/main.yml b/library/roles/letsencrypt-acmetool-client/defaults/main.yml similarity index 100% rename from letsencrypt-acmetool-client/defaults/main.yml rename to library/roles/letsencrypt-acmetool-client/defaults/main.yml diff --git a/letsencrypt-acmetool-client/handlers/main.yml b/library/roles/letsencrypt-acmetool-client/handlers/main.yml similarity index 100% rename from letsencrypt-acmetool-client/handlers/main.yml rename to library/roles/letsencrypt-acmetool-client/handlers/main.yml diff --git a/letsencrypt-acmetool-client/tasks/main.yml b/library/roles/letsencrypt-acmetool-client/tasks/main.yml similarity index 100% rename from letsencrypt-acmetool-client/tasks/main.yml rename to library/roles/letsencrypt-acmetool-client/tasks/main.yml diff --git a/letsencrypt-acmetool-client/templates/acme-cert-request.sh.j2 b/library/roles/letsencrypt-acmetool-client/templates/acme-cert-request.sh.j2 similarity index 100% rename from letsencrypt-acmetool-client/templates/acme-cert-request.sh.j2 rename to library/roles/letsencrypt-acmetool-client/templates/acme-cert-request.sh.j2 diff --git a/letsencrypt-acmetool-client/templates/acme-sudoers.j2 b/library/roles/letsencrypt-acmetool-client/templates/acme-sudoers.j2 similarity index 100% rename from letsencrypt-acmetool-client/templates/acme-sudoers.j2 rename to library/roles/letsencrypt-acmetool-client/templates/acme-sudoers.j2 diff --git a/letsencrypt-acmetool-client/templates/cert-requirements.j2 b/library/roles/letsencrypt-acmetool-client/templates/cert-requirements.j2 similarity index 100% rename from letsencrypt-acmetool-client/templates/cert-requirements.j2 rename to library/roles/letsencrypt-acmetool-client/templates/cert-requirements.j2 diff --git a/letsencrypt-acmetool-client/templates/letsencrypt-default.j2 b/library/roles/letsencrypt-acmetool-client/templates/letsencrypt-default.j2 similarity index 100% rename from letsencrypt-acmetool-client/templates/letsencrypt-default.j2 rename to library/roles/letsencrypt-acmetool-client/templates/letsencrypt-default.j2 diff --git a/letsencrypt-acmetool-client/templates/responses.j2 b/library/roles/letsencrypt-acmetool-client/templates/responses.j2 similarity index 100% rename from letsencrypt-acmetool-client/templates/responses.j2 rename to library/roles/letsencrypt-acmetool-client/templates/responses.j2 diff --git a/linux-kernel-sysctl/defaults/main.yml b/library/roles/linux-kernel-sysctl/defaults/main.yml similarity index 100% rename from linux-kernel-sysctl/defaults/main.yml rename to library/roles/linux-kernel-sysctl/defaults/main.yml diff --git a/linux-kernel-sysctl/tasks/main.yml b/library/roles/linux-kernel-sysctl/tasks/main.yml similarity index 100% rename from linux-kernel-sysctl/tasks/main.yml rename to library/roles/linux-kernel-sysctl/tasks/main.yml diff --git a/mediawiki/defaults/main.yml b/library/roles/mediawiki/defaults/main.yml similarity index 100% rename from mediawiki/defaults/main.yml rename to library/roles/mediawiki/defaults/main.yml diff --git a/mediawiki/tasks/main.yml b/library/roles/mediawiki/tasks/main.yml similarity index 100% rename from mediawiki/tasks/main.yml rename to library/roles/mediawiki/tasks/main.yml diff --git a/memcached/defaults/main.yml b/library/roles/memcached/defaults/main.yml similarity index 100% rename from memcached/defaults/main.yml rename to library/roles/memcached/defaults/main.yml diff --git a/memcached/handlers/main.yml b/library/roles/memcached/handlers/main.yml similarity index 100% rename from memcached/handlers/main.yml rename to library/roles/memcached/handlers/main.yml diff --git a/memcached/tasks/main.yml b/library/roles/memcached/tasks/main.yml similarity index 100% rename from memcached/tasks/main.yml rename to library/roles/memcached/tasks/main.yml diff --git a/memcached/templates/memcached.conf.j2 b/library/roles/memcached/templates/memcached.conf.j2 similarity index 100% rename from memcached/templates/memcached.conf.j2 rename to library/roles/memcached/templates/memcached.conf.j2 diff --git a/mongodb-org/defaults/main.yml b/library/roles/mongodb-org/defaults/main.yml similarity index 100% rename from mongodb-org/defaults/main.yml rename to library/roles/mongodb-org/defaults/main.yml diff --git a/mongodb-org/files/lets-encrypt-x3-cross-signed.pem b/library/roles/mongodb-org/files/lets-encrypt-x3-cross-signed.pem similarity index 100% rename from mongodb-org/files/lets-encrypt-x3-cross-signed.pem rename to library/roles/mongodb-org/files/lets-encrypt-x3-cross-signed.pem diff --git a/mongodb-org/handlers/main.yml b/library/roles/mongodb-org/handlers/main.yml similarity index 100% rename from mongodb-org/handlers/main.yml rename to library/roles/mongodb-org/handlers/main.yml diff --git a/mongodb-org/tasks/main.yml b/library/roles/mongodb-org/tasks/main.yml similarity index 100% rename from mongodb-org/tasks/main.yml rename to library/roles/mongodb-org/tasks/main.yml diff --git a/mongodb-org/tasks/mongodb-letsencrypt-acmetool.yml b/library/roles/mongodb-org/tasks/mongodb-letsencrypt-acmetool.yml similarity index 100% rename from mongodb-org/tasks/mongodb-letsencrypt-acmetool.yml rename to library/roles/mongodb-org/tasks/mongodb-letsencrypt-acmetool.yml diff --git a/mongodb-org/tasks/mongodb.yml b/library/roles/mongodb-org/tasks/mongodb.yml similarity index 100% rename from mongodb-org/tasks/mongodb.yml rename to library/roles/mongodb-org/tasks/mongodb.yml diff --git a/mongodb-org/templates/mongo_log_rotate.sh.j2 b/library/roles/mongodb-org/templates/mongo_log_rotate.sh.j2 similarity index 100% rename from mongodb-org/templates/mongo_log_rotate.sh.j2 rename to library/roles/mongodb-org/templates/mongo_log_rotate.sh.j2 diff --git a/mongodb-org/templates/mongod-3.0.conf.j2 b/library/roles/mongodb-org/templates/mongod-3.0.conf.j2 similarity index 100% rename from mongodb-org/templates/mongod-3.0.conf.j2 rename to library/roles/mongodb-org/templates/mongod-3.0.conf.j2 diff --git a/mongodb-org/templates/mongod-3.2.conf.j2 b/library/roles/mongodb-org/templates/mongod-3.2.conf.j2 similarity index 100% rename from mongodb-org/templates/mongod-3.2.conf.j2 rename to library/roles/mongodb-org/templates/mongod-3.2.conf.j2 diff --git a/mongodb-org/templates/mongod-3.4.conf.j2 b/library/roles/mongodb-org/templates/mongod-3.4.conf.j2 similarity index 100% rename from mongodb-org/templates/mongod-3.4.conf.j2 rename to library/roles/mongodb-org/templates/mongod-3.4.conf.j2 diff --git a/mongodb-org/templates/mongod-3.6.conf.j2 b/library/roles/mongodb-org/templates/mongod-3.6.conf.j2 similarity index 100% rename from mongodb-org/templates/mongod-3.6.conf.j2 rename to library/roles/mongodb-org/templates/mongod-3.6.conf.j2 diff --git a/mongodb-org/templates/mongod-default.j2 b/library/roles/mongodb-org/templates/mongod-default.j2 similarity index 100% rename from mongodb-org/templates/mongod-default.j2 rename to library/roles/mongodb-org/templates/mongod-default.j2 diff --git a/mongodb-org/templates/mongodb-letsencrypt-acmetool.sh b/library/roles/mongodb-org/templates/mongodb-letsencrypt-acmetool.sh similarity index 100% rename from mongodb-org/templates/mongodb-letsencrypt-acmetool.sh rename to library/roles/mongodb-org/templates/mongodb-letsencrypt-acmetool.sh diff --git a/mongodb-org/vars/main.yml b/library/roles/mongodb-org/vars/main.yml similarity index 100% rename from mongodb-org/vars/main.yml rename to library/roles/mongodb-org/vars/main.yml diff --git a/mongodb/defaults/main.yml b/library/roles/mongodb/defaults/main.yml similarity index 100% rename from mongodb/defaults/main.yml rename to library/roles/mongodb/defaults/main.yml diff --git a/mongodb/handlers/main.yml b/library/roles/mongodb/handlers/main.yml similarity index 100% rename from mongodb/handlers/main.yml rename to library/roles/mongodb/handlers/main.yml diff --git a/mongodb/tasks/main.yml b/library/roles/mongodb/tasks/main.yml similarity index 100% rename from mongodb/tasks/main.yml rename to library/roles/mongodb/tasks/main.yml diff --git a/mongodb/templates/mongo_log_rotate.sh.j2 b/library/roles/mongodb/templates/mongo_log_rotate.sh.j2 similarity index 100% rename from mongodb/templates/mongo_log_rotate.sh.j2 rename to library/roles/mongodb/templates/mongo_log_rotate.sh.j2 diff --git a/mongodb/templates/mongodb-2.4.conf.j2 b/library/roles/mongodb/templates/mongodb-2.4.conf.j2 similarity index 100% rename from mongodb/templates/mongodb-2.4.conf.j2 rename to library/roles/mongodb/templates/mongodb-2.4.conf.j2 diff --git a/mono/defaults/main.yml b/library/roles/mono/defaults/main.yml similarity index 100% rename from mono/defaults/main.yml rename to library/roles/mono/defaults/main.yml diff --git a/mono/tasks/main.yml b/library/roles/mono/tasks/main.yml similarity index 100% rename from mono/tasks/main.yml rename to library/roles/mono/tasks/main.yml diff --git a/motd/defaults/main.yml b/library/roles/motd/defaults/main.yml similarity index 100% rename from motd/defaults/main.yml rename to library/roles/motd/defaults/main.yml diff --git a/motd/tasks/deb_motd.yml b/library/roles/motd/tasks/deb_motd.yml similarity index 100% rename from motd/tasks/deb_motd.yml rename to library/roles/motd/tasks/deb_motd.yml diff --git a/motd/tasks/main.yml b/library/roles/motd/tasks/main.yml similarity index 100% rename from motd/tasks/main.yml rename to library/roles/motd/tasks/main.yml diff --git a/motd/tasks/rh_motd.yml b/library/roles/motd/tasks/rh_motd.yml similarity index 100% rename from motd/tasks/rh_motd.yml rename to library/roles/motd/tasks/rh_motd.yml diff --git a/motd/templates/motd.j2 b/library/roles/motd/templates/motd.j2 similarity index 100% rename from motd/templates/motd.j2 rename to library/roles/motd/templates/motd.j2 diff --git a/motd/templates/update_motd.j2 b/library/roles/motd/templates/update_motd.j2 similarity index 100% rename from motd/templates/update_motd.j2 rename to library/roles/motd/templates/update_motd.j2 diff --git a/mysql/defaults/main.yml b/library/roles/mysql/defaults/main.yml similarity index 100% rename from mysql/defaults/main.yml rename to library/roles/mysql/defaults/main.yml diff --git a/mysql/files/mysql-backup.sh b/library/roles/mysql/files/mysql-backup.sh similarity index 100% rename from mysql/files/mysql-backup.sh rename to library/roles/mysql/files/mysql-backup.sh diff --git a/mysql/handlers/main.yml b/library/roles/mysql/handlers/main.yml similarity index 100% rename from mysql/handlers/main.yml rename to library/roles/mysql/handlers/main.yml diff --git a/mysql/tasks/configure_root_access.yml b/library/roles/mysql/tasks/configure_root_access.yml similarity index 100% rename from mysql/tasks/configure_root_access.yml rename to library/roles/mysql/tasks/configure_root_access.yml diff --git a/mysql/tasks/disable-mariadb-service.yml b/library/roles/mysql/tasks/disable-mariadb-service.yml similarity index 100% rename from mysql/tasks/disable-mariadb-service.yml rename to library/roles/mysql/tasks/disable-mariadb-service.yml diff --git a/mysql/tasks/main.yml b/library/roles/mysql/tasks/main.yml similarity index 100% rename from mysql/tasks/main.yml rename to library/roles/mysql/tasks/main.yml diff --git a/mysql/tasks/manage-mysql-service.yml b/library/roles/mysql/tasks/manage-mysql-service.yml similarity index 100% rename from mysql/tasks/manage-mysql-service.yml rename to library/roles/mysql/tasks/manage-mysql-service.yml diff --git a/mysql/tasks/manage_my_db.yml b/library/roles/mysql/tasks/manage_my_db.yml similarity index 100% rename from mysql/tasks/manage_my_db.yml rename to library/roles/mysql/tasks/manage_my_db.yml diff --git a/mysql/tasks/mysql-backup.yml b/library/roles/mysql/tasks/mysql-backup.yml similarity index 100% rename from mysql/tasks/mysql-backup.yml rename to library/roles/mysql/tasks/mysql-backup.yml diff --git a/mysql/tasks/mysql-conf.yml b/library/roles/mysql/tasks/mysql-conf.yml similarity index 100% rename from mysql/tasks/mysql-conf.yml rename to library/roles/mysql/tasks/mysql-conf.yml diff --git a/mysql/tasks/packages.yml b/library/roles/mysql/tasks/packages.yml similarity index 100% rename from mysql/tasks/packages.yml rename to library/roles/mysql/tasks/packages.yml diff --git a/mysql/templates/client.cnf.j2 b/library/roles/mysql/templates/client.cnf.j2 similarity index 100% rename from mysql/templates/client.cnf.j2 rename to library/roles/mysql/templates/client.cnf.j2 diff --git a/mysql/templates/dot_my.cnf.j2 b/library/roles/mysql/templates/dot_my.cnf.j2 similarity index 100% rename from mysql/templates/dot_my.cnf.j2 rename to library/roles/mysql/templates/dot_my.cnf.j2 diff --git a/mysql/templates/mysql-backup.cron.j2 b/library/roles/mysql/templates/mysql-backup.cron.j2 similarity index 100% rename from mysql/templates/mysql-backup.cron.j2 rename to library/roles/mysql/templates/mysql-backup.cron.j2 diff --git a/mysql/templates/mysql-clients.cnf.j2 b/library/roles/mysql/templates/mysql-clients.cnf.j2 similarity index 100% rename from mysql/templates/mysql-clients.cnf.j2 rename to library/roles/mysql/templates/mysql-clients.cnf.j2 diff --git a/mysql/templates/mysql_backup-default.j2 b/library/roles/mysql/templates/mysql_backup-default.j2 similarity index 100% rename from mysql/templates/mysql_backup-default.j2 rename to library/roles/mysql/templates/mysql_backup-default.j2 diff --git a/mysql/templates/server.cnf.j2 b/library/roles/mysql/templates/server.cnf.j2 similarity index 100% rename from mysql/templates/server.cnf.j2 rename to library/roles/mysql/templates/server.cnf.j2 diff --git a/nagios-nrpe-tomcat/defaults/main.yml b/library/roles/nagios-nrpe-tomcat/defaults/main.yml similarity index 100% rename from nagios-nrpe-tomcat/defaults/main.yml rename to library/roles/nagios-nrpe-tomcat/defaults/main.yml diff --git a/nagios-nrpe-tomcat/files/check_tomcat b/library/roles/nagios-nrpe-tomcat/files/check_tomcat similarity index 100% rename from nagios-nrpe-tomcat/files/check_tomcat rename to library/roles/nagios-nrpe-tomcat/files/check_tomcat diff --git a/nagios-nrpe-tomcat/tasks/main.yml b/library/roles/nagios-nrpe-tomcat/tasks/main.yml similarity index 100% rename from nagios-nrpe-tomcat/tasks/main.yml rename to library/roles/nagios-nrpe-tomcat/tasks/main.yml diff --git a/nagios-server/defaults/main.yml b/library/roles/nagios-server/defaults/main.yml similarity index 100% rename from nagios-server/defaults/main.yml rename to library/roles/nagios-server/defaults/main.yml diff --git a/nagios-server/handlers/main.yml b/library/roles/nagios-server/handlers/main.yml similarity index 100% rename from nagios-server/handlers/main.yml rename to library/roles/nagios-server/handlers/main.yml diff --git a/nagios/defaults/main.yml b/library/roles/nagios/defaults/main.yml similarity index 100% rename from nagios/defaults/main.yml rename to library/roles/nagios/defaults/main.yml diff --git a/nagios/files/check_dell_warranty.py b/library/roles/nagios/files/check_dell_warranty.py similarity index 100% rename from nagios/files/check_dell_warranty.py rename to library/roles/nagios/files/check_dell_warranty.py diff --git a/nagios/files/check_linux_raid b/library/roles/nagios/files/check_linux_raid similarity index 100% rename from nagios/files/check_linux_raid rename to library/roles/nagios/files/check_linux_raid diff --git a/nagios/files/check_memory.xenial b/library/roles/nagios/files/check_memory.xenial similarity index 100% rename from nagios/files/check_memory.xenial rename to library/roles/nagios/files/check_memory.xenial diff --git a/nagios/files/check_netint.pl b/library/roles/nagios/files/check_netint.pl similarity index 100% rename from nagios/files/check_netint.pl rename to library/roles/nagios/files/check_netint.pl diff --git a/nagios/files/check_openmanage b/library/roles/nagios/files/check_openmanage similarity index 100% rename from nagios/files/check_openmanage rename to library/roles/nagios/files/check_openmanage diff --git a/nagios/files/check_postgresql_backup b/library/roles/nagios/files/check_postgresql_backup similarity index 100% rename from nagios/files/check_postgresql_backup rename to library/roles/nagios/files/check_postgresql_backup diff --git a/nagios/files/check_smart b/library/roles/nagios/files/check_smart similarity index 100% rename from nagios/files/check_smart rename to library/roles/nagios/files/check_smart diff --git a/nagios/files/check_system_pp b/library/roles/nagios/files/check_system_pp similarity index 100% rename from nagios/files/check_system_pp rename to library/roles/nagios/files/check_system_pp diff --git a/nagios/files/cleanup-leaked-ipvsems.sh b/library/roles/nagios/files/cleanup-leaked-ipvsems.sh similarity index 100% rename from nagios/files/cleanup-leaked-ipvsems.sh rename to library/roles/nagios/files/cleanup-leaked-ipvsems.sh diff --git a/nagios/files/dell_warranty_lifetime.sh b/library/roles/nagios/files/dell_warranty_lifetime.sh similarity index 100% rename from nagios/files/dell_warranty_lifetime.sh rename to library/roles/nagios/files/dell_warranty_lifetime.sh diff --git a/nagios/files/hardy-iotop-ppa b/library/roles/nagios/files/hardy-iotop-ppa similarity index 100% rename from nagios/files/hardy-iotop-ppa rename to library/roles/nagios/files/hardy-iotop-ppa diff --git a/nagios/files/linux.dell.com.sources.list b/library/roles/nagios/files/linux.dell.com.sources.list similarity index 100% rename from nagios/files/linux.dell.com.sources.list rename to library/roles/nagios/files/linux.dell.com.sources.list diff --git a/nagios/files/research-infrastructures.eu.system.list b/library/roles/nagios/files/research-infrastructures.eu.system.list similarity index 100% rename from nagios/files/research-infrastructures.eu.system.list rename to library/roles/nagios/files/research-infrastructures.eu.system.list diff --git a/nagios/files/show_users b/library/roles/nagios/files/show_users similarity index 100% rename from nagios/files/show_users rename to library/roles/nagios/files/show_users diff --git a/nagios/handlers/main.yml b/library/roles/nagios/handlers/main.yml similarity index 100% rename from nagios/handlers/main.yml rename to library/roles/nagios/handlers/main.yml diff --git a/nagios/tasks/dell-omsa.yml b/library/roles/nagios/tasks/dell-omsa.yml similarity index 100% rename from nagios/tasks/dell-omsa.yml rename to library/roles/nagios/tasks/dell-omsa.yml diff --git a/nagios/tasks/hardware-checks.yml b/library/roles/nagios/tasks/hardware-checks.yml similarity index 100% rename from nagios/tasks/hardware-checks.yml rename to library/roles/nagios/tasks/hardware-checks.yml diff --git a/nagios/tasks/main.yml b/library/roles/nagios/tasks/main.yml similarity index 100% rename from nagios/tasks/main.yml rename to library/roles/nagios/tasks/main.yml diff --git a/nagios/tasks/nagios.yml b/library/roles/nagios/tasks/nagios.yml similarity index 100% rename from nagios/tasks/nagios.yml rename to library/roles/nagios/tasks/nagios.yml diff --git a/nagios/tasks/nsca.yml b/library/roles/nagios/tasks/nsca.yml similarity index 100% rename from nagios/tasks/nsca.yml rename to library/roles/nagios/tasks/nsca.yml diff --git a/nagios/tasks/postgresql-nagios.yml b/library/roles/nagios/tasks/postgresql-nagios.yml similarity index 100% rename from nagios/tasks/postgresql-nagios.yml rename to library/roles/nagios/tasks/postgresql-nagios.yml diff --git a/nagios/templates/check_library.sh.j2 b/library/roles/nagios/templates/check_library.sh.j2 similarity index 100% rename from nagios/templates/check_library.sh.j2 rename to library/roles/nagios/templates/check_library.sh.j2 diff --git a/nagios/templates/common-nrpe.cfg.j2 b/library/roles/nagios/templates/common-nrpe.cfg.j2 similarity index 100% rename from nagios/templates/common-nrpe.cfg.j2 rename to library/roles/nagios/templates/common-nrpe.cfg.j2 diff --git a/nagios/templates/linux.dell.com.sources.list.j2 b/library/roles/nagios/templates/linux.dell.com.sources.list.j2 similarity index 100% rename from nagios/templates/linux.dell.com.sources.list.j2 rename to library/roles/nagios/templates/linux.dell.com.sources.list.j2 diff --git a/nagios/templates/nagios-hw.sudoers.j2 b/library/roles/nagios/templates/nagios-hw.sudoers.j2 similarity index 100% rename from nagios/templates/nagios-hw.sudoers.j2 rename to library/roles/nagios/templates/nagios-hw.sudoers.j2 diff --git a/nagios/templates/nagios.sudoers.j2 b/library/roles/nagios/templates/nagios.sudoers.j2 similarity index 100% rename from nagios/templates/nagios.sudoers.j2 rename to library/roles/nagios/templates/nagios.sudoers.j2 diff --git a/nagios/templates/nrpe_local.cfg.j2 b/library/roles/nagios/templates/nrpe_local.cfg.j2 similarity index 100% rename from nagios/templates/nrpe_local.cfg.j2 rename to library/roles/nagios/templates/nrpe_local.cfg.j2 diff --git a/nagios/templates/postgresql-nrpe.cfg.j2 b/library/roles/nagios/templates/postgresql-nrpe.cfg.j2 similarity index 100% rename from nagios/templates/postgresql-nrpe.cfg.j2 rename to library/roles/nagios/templates/postgresql-nrpe.cfg.j2 diff --git a/nagios/templates/postgresql-sudoers.j2 b/library/roles/nagios/templates/postgresql-sudoers.j2 similarity index 100% rename from nagios/templates/postgresql-sudoers.j2 rename to library/roles/nagios/templates/postgresql-sudoers.j2 diff --git a/nagios/templates/send_nsca.j2 b/library/roles/nagios/templates/send_nsca.j2 similarity index 100% rename from nagios/templates/send_nsca.j2 rename to library/roles/nagios/templates/send_nsca.j2 diff --git a/nemis-precise-backports-repo/tasks/main.yml b/library/roles/nemis-precise-backports-repo/tasks/main.yml similarity index 100% rename from nemis-precise-backports-repo/tasks/main.yml rename to library/roles/nemis-precise-backports-repo/tasks/main.yml diff --git a/nextcloud/defaults/main.yml b/library/roles/nextcloud/defaults/main.yml similarity index 100% rename from nextcloud/defaults/main.yml rename to library/roles/nextcloud/defaults/main.yml diff --git a/nextcloud/meta/main.yml b/library/roles/nextcloud/meta/main.yml similarity index 100% rename from nextcloud/meta/main.yml rename to library/roles/nextcloud/meta/main.yml diff --git a/nextcloud/tasks/main.yml b/library/roles/nextcloud/tasks/main.yml similarity index 100% rename from nextcloud/tasks/main.yml rename to library/roles/nextcloud/tasks/main.yml diff --git a/nextcloud/tasks/nextcloud-install.yml b/library/roles/nextcloud/tasks/nextcloud-install.yml similarity index 100% rename from nextcloud/tasks/nextcloud-install.yml rename to library/roles/nextcloud/tasks/nextcloud-install.yml diff --git a/nextcloud/tasks/nextcloud-nginx.yml b/library/roles/nextcloud/tasks/nextcloud-nginx.yml similarity index 100% rename from nextcloud/tasks/nextcloud-nginx.yml rename to library/roles/nextcloud/tasks/nextcloud-nginx.yml diff --git a/nextcloud/templates/nginx-virthost.conf b/library/roles/nextcloud/templates/nginx-virthost.conf similarity index 100% rename from nextcloud/templates/nginx-virthost.conf rename to library/roles/nextcloud/templates/nginx-virthost.conf diff --git a/nextcloud/vars/main.yml b/library/roles/nextcloud/vars/main.yml similarity index 100% rename from nextcloud/vars/main.yml rename to library/roles/nextcloud/vars/main.yml diff --git a/nginx/defaults/main.yml b/library/roles/nginx/defaults/main.yml similarity index 100% rename from nginx/defaults/main.yml rename to library/roles/nginx/defaults/main.yml diff --git a/nginx/files/nginx-letsencrypt-acme.sh b/library/roles/nginx/files/nginx-letsencrypt-acme.sh similarity index 100% rename from nginx/files/nginx-letsencrypt-acme.sh rename to library/roles/nginx/files/nginx-letsencrypt-acme.sh diff --git a/nginx/files/nginx.pam b/library/roles/nginx/files/nginx.pam similarity index 100% rename from nginx/files/nginx.pam rename to library/roles/nginx/files/nginx.pam diff --git a/nginx/handlers/main.yml b/library/roles/nginx/handlers/main.yml similarity index 100% rename from nginx/handlers/main.yml rename to library/roles/nginx/handlers/main.yml diff --git a/nginx/meta/main.yml b/library/roles/nginx/meta/main.yml similarity index 100% rename from nginx/meta/main.yml rename to library/roles/nginx/meta/main.yml diff --git a/nginx/tasks/basic-auth.yml b/library/roles/nginx/tasks/basic-auth.yml similarity index 100% rename from nginx/tasks/basic-auth.yml rename to library/roles/nginx/tasks/basic-auth.yml diff --git a/nginx/tasks/main.yml b/library/roles/nginx/tasks/main.yml similarity index 100% rename from nginx/tasks/main.yml rename to library/roles/nginx/tasks/main.yml diff --git a/nginx/tasks/nginx-config.yml b/library/roles/nginx/tasks/nginx-config.yml similarity index 100% rename from nginx/tasks/nginx-config.yml rename to library/roles/nginx/tasks/nginx-config.yml diff --git a/nginx/tasks/nginx-letsencrypt.yml b/library/roles/nginx/tasks/nginx-letsencrypt.yml similarity index 100% rename from nginx/tasks/nginx-letsencrypt.yml rename to library/roles/nginx/tasks/nginx-letsencrypt.yml diff --git a/nginx/tasks/nginx-virtualhosts.yml b/library/roles/nginx/tasks/nginx-virtualhosts.yml similarity index 100% rename from nginx/tasks/nginx-virtualhosts.yml rename to library/roles/nginx/tasks/nginx-virtualhosts.yml diff --git a/nginx/tasks/nginx.yml b/library/roles/nginx/tasks/nginx.yml similarity index 100% rename from nginx/tasks/nginx.yml rename to library/roles/nginx/tasks/nginx.yml diff --git a/nginx/tasks/pam-ldap.yml b/library/roles/nginx/tasks/pam-ldap.yml similarity index 100% rename from nginx/tasks/pam-ldap.yml rename to library/roles/nginx/tasks/pam-ldap.yml diff --git a/nginx/templates/ldap.conf.j2 b/library/roles/nginx/templates/ldap.conf.j2 similarity index 100% rename from nginx/templates/ldap.conf.j2 rename to library/roles/nginx/templates/ldap.conf.j2 diff --git a/nginx/templates/letsencrypt-proxy.conf.j2 b/library/roles/nginx/templates/letsencrypt-proxy.conf.j2 similarity index 100% rename from nginx/templates/letsencrypt-proxy.conf.j2 rename to library/roles/nginx/templates/letsencrypt-proxy.conf.j2 diff --git a/nginx/templates/nginx-browser-cache.conf.j2 b/library/roles/nginx/templates/nginx-browser-cache.conf.j2 similarity index 100% rename from nginx/templates/nginx-browser-cache.conf.j2 rename to library/roles/nginx/templates/nginx-browser-cache.conf.j2 diff --git a/nginx/templates/nginx-compression.conf.j2 b/library/roles/nginx/templates/nginx-compression.conf.j2 similarity index 100% rename from nginx/templates/nginx-compression.conf.j2 rename to library/roles/nginx/templates/nginx-compression.conf.j2 diff --git a/nginx/templates/nginx-cors.conf.j2 b/library/roles/nginx/templates/nginx-cors.conf.j2 similarity index 100% rename from nginx/templates/nginx-cors.conf.j2 rename to library/roles/nginx/templates/nginx-cors.conf.j2 diff --git a/nginx/templates/nginx-proxy-params.conf.j2 b/library/roles/nginx/templates/nginx-proxy-params.conf.j2 similarity index 100% rename from nginx/templates/nginx-proxy-params.conf.j2 rename to library/roles/nginx/templates/nginx-proxy-params.conf.j2 diff --git a/nginx/templates/nginx-server-ssl.conf.j2 b/library/roles/nginx/templates/nginx-server-ssl.conf.j2 similarity index 100% rename from nginx/templates/nginx-server-ssl.conf.j2 rename to library/roles/nginx/templates/nginx-server-ssl.conf.j2 diff --git a/nginx/templates/nginx-virthost.j2 b/library/roles/nginx/templates/nginx-virthost.j2 similarity index 100% rename from nginx/templates/nginx-virthost.j2 rename to library/roles/nginx/templates/nginx-virthost.j2 diff --git a/nginx/templates/nginx-websockets.conf.j2 b/library/roles/nginx/templates/nginx-websockets.conf.j2 similarity index 100% rename from nginx/templates/nginx-websockets.conf.j2 rename to library/roles/nginx/templates/nginx-websockets.conf.j2 diff --git a/nginx/templates/nginx.conf.j2 b/library/roles/nginx/templates/nginx.conf.j2 similarity index 100% rename from nginx/templates/nginx.conf.j2 rename to library/roles/nginx/templates/nginx.conf.j2 diff --git a/node_js/defaults/main.yml b/library/roles/node_js/defaults/main.yml similarity index 100% rename from node_js/defaults/main.yml rename to library/roles/node_js/defaults/main.yml diff --git a/node_js/tasks/main.yml b/library/roles/node_js/tasks/main.yml similarity index 100% rename from node_js/tasks/main.yml rename to library/roles/node_js/tasks/main.yml diff --git a/octave/defaults/main.yml b/library/roles/octave/defaults/main.yml similarity index 100% rename from octave/defaults/main.yml rename to library/roles/octave/defaults/main.yml diff --git a/octave/tasks/main.yml b/library/roles/octave/tasks/main.yml similarity index 100% rename from octave/tasks/main.yml rename to library/roles/octave/tasks/main.yml diff --git a/onlyoffice_docserver/defaults/main.yml b/library/roles/onlyoffice_docserver/defaults/main.yml similarity index 100% rename from onlyoffice_docserver/defaults/main.yml rename to library/roles/onlyoffice_docserver/defaults/main.yml diff --git a/onlyoffice_docserver/handlers/main.yml b/library/roles/onlyoffice_docserver/handlers/main.yml similarity index 100% rename from onlyoffice_docserver/handlers/main.yml rename to library/roles/onlyoffice_docserver/handlers/main.yml diff --git a/onlyoffice_docserver/meta/main.yml b/library/roles/onlyoffice_docserver/meta/main.yml similarity index 100% rename from onlyoffice_docserver/meta/main.yml rename to library/roles/onlyoffice_docserver/meta/main.yml diff --git a/onlyoffice_docserver/tasks/main.yml b/library/roles/onlyoffice_docserver/tasks/main.yml similarity index 100% rename from onlyoffice_docserver/tasks/main.yml rename to library/roles/onlyoffice_docserver/tasks/main.yml diff --git a/onlyoffice_docserver/templates/onlyoffice-documentserver-ssl.conf b/library/roles/onlyoffice_docserver/templates/onlyoffice-documentserver-ssl.conf similarity index 100% rename from onlyoffice_docserver/templates/onlyoffice-documentserver-ssl.conf rename to library/roles/onlyoffice_docserver/templates/onlyoffice-documentserver-ssl.conf diff --git a/onlyoffice_docserver/vars/main.yml b/library/roles/onlyoffice_docserver/vars/main.yml similarity index 100% rename from onlyoffice_docserver/vars/main.yml rename to library/roles/onlyoffice_docserver/vars/main.yml diff --git a/onlyoffice_portal/defaults/main.yml b/library/roles/onlyoffice_portal/defaults/main.yml similarity index 100% rename from onlyoffice_portal/defaults/main.yml rename to library/roles/onlyoffice_portal/defaults/main.yml diff --git a/onlyoffice_portal/meta/main.yml b/library/roles/onlyoffice_portal/meta/main.yml similarity index 100% rename from onlyoffice_portal/meta/main.yml rename to library/roles/onlyoffice_portal/meta/main.yml diff --git a/onlyoffice_portal/tasks/main.yml b/library/roles/onlyoffice_portal/tasks/main.yml similarity index 100% rename from onlyoffice_portal/tasks/main.yml rename to library/roles/onlyoffice_portal/tasks/main.yml diff --git a/onlyoffice_portal/templates/onlyoffice-letsencrypt.sh b/library/roles/onlyoffice_portal/templates/onlyoffice-letsencrypt.sh similarity index 100% rename from onlyoffice_portal/templates/onlyoffice-letsencrypt.sh rename to library/roles/onlyoffice_portal/templates/onlyoffice-letsencrypt.sh diff --git a/onlyoffice_portal/vars/main.yml b/library/roles/onlyoffice_portal/vars/main.yml similarity index 100% rename from onlyoffice_portal/vars/main.yml rename to library/roles/onlyoffice_portal/vars/main.yml diff --git a/opencpu/defaults/main.yml b/library/roles/opencpu/defaults/main.yml similarity index 100% rename from opencpu/defaults/main.yml rename to library/roles/opencpu/defaults/main.yml diff --git a/opencpu/handlers/main.yml b/library/roles/opencpu/handlers/main.yml similarity index 100% rename from opencpu/handlers/main.yml rename to library/roles/opencpu/handlers/main.yml diff --git a/opencpu/tasks/main.yml b/library/roles/opencpu/tasks/main.yml similarity index 100% rename from opencpu/tasks/main.yml rename to library/roles/opencpu/tasks/main.yml diff --git a/opencpu/templates/custom-opencpu.conf.j2 b/library/roles/opencpu/templates/custom-opencpu.conf.j2 similarity index 100% rename from opencpu/templates/custom-opencpu.conf.j2 rename to library/roles/opencpu/templates/custom-opencpu.conf.j2 diff --git a/openjdk/defaults/main.yml b/library/roles/openjdk/defaults/main.yml similarity index 100% rename from openjdk/defaults/main.yml rename to library/roles/openjdk/defaults/main.yml diff --git a/openjdk/tasks/main.yml b/library/roles/openjdk/tasks/main.yml similarity index 100% rename from openjdk/tasks/main.yml rename to library/roles/openjdk/tasks/main.yml diff --git a/openldap-server/defaults/main.yml b/library/roles/openldap-server/defaults/main.yml similarity index 100% rename from openldap-server/defaults/main.yml rename to library/roles/openldap-server/defaults/main.yml diff --git a/openldap-server/files/olcSSL.ldif b/library/roles/openldap-server/files/olcSSL.ldif similarity index 100% rename from openldap-server/files/olcSSL.ldif rename to library/roles/openldap-server/files/olcSSL.ldif diff --git a/openldap-server/files/openldap-letsencrypt-acme.sh b/library/roles/openldap-server/files/openldap-letsencrypt-acme.sh similarity index 100% rename from openldap-server/files/openldap-letsencrypt-acme.sh rename to library/roles/openldap-server/files/openldap-letsencrypt-acme.sh diff --git a/openldap-server/files/usr.sbin.slapd.apparmor b/library/roles/openldap-server/files/usr.sbin.slapd.apparmor similarity index 100% rename from openldap-server/files/usr.sbin.slapd.apparmor rename to library/roles/openldap-server/files/usr.sbin.slapd.apparmor diff --git a/openldap-server/handlers/main.yml b/library/roles/openldap-server/handlers/main.yml similarity index 100% rename from openldap-server/handlers/main.yml rename to library/roles/openldap-server/handlers/main.yml diff --git a/openldap-server/tasks/main.yml b/library/roles/openldap-server/tasks/main.yml similarity index 100% rename from openldap-server/tasks/main.yml rename to library/roles/openldap-server/tasks/main.yml diff --git a/openldap-server/tasks/openldap-letsencrypt.yml b/library/roles/openldap-server/tasks/openldap-letsencrypt.yml similarity index 100% rename from openldap-server/tasks/openldap-letsencrypt.yml rename to library/roles/openldap-server/tasks/openldap-letsencrypt.yml diff --git a/openldap-server/tasks/openldap_initializazion.yml b/library/roles/openldap-server/tasks/openldap_initializazion.yml similarity index 100% rename from openldap-server/tasks/openldap_initializazion.yml rename to library/roles/openldap-server/tasks/openldap_initializazion.yml diff --git a/openldap-server/tasks/openldap_maintenance.yml b/library/roles/openldap-server/tasks/openldap_maintenance.yml similarity index 100% rename from openldap-server/tasks/openldap_maintenance.yml rename to library/roles/openldap-server/tasks/openldap_maintenance.yml diff --git a/openldap-server/tasks/openldap_master_setup.yml b/library/roles/openldap-server/tasks/openldap_master_setup.yml similarity index 100% rename from openldap-server/tasks/openldap_master_setup.yml rename to library/roles/openldap-server/tasks/openldap_master_setup.yml diff --git a/openldap-server/tasks/openldap_packages.yml b/library/roles/openldap-server/tasks/openldap_packages.yml similarity index 100% rename from openldap-server/tasks/openldap_packages.yml rename to library/roles/openldap-server/tasks/openldap_packages.yml diff --git a/openldap-server/tasks/openldap_slave_setup.yml b/library/roles/openldap-server/tasks/openldap_slave_setup.yml similarity index 100% rename from openldap-server/tasks/openldap_slave_setup.yml rename to library/roles/openldap-server/tasks/openldap_slave_setup.yml diff --git a/openldap-server/templates/DB_CONFIG.j2 b/library/roles/openldap-server/templates/DB_CONFIG.j2 similarity index 100% rename from openldap-server/templates/DB_CONFIG.j2 rename to library/roles/openldap-server/templates/DB_CONFIG.j2 diff --git a/openldap-server/templates/adminpwd.ldif.j2 b/library/roles/openldap-server/templates/adminpwd.ldif.j2 similarity index 100% rename from openldap-server/templates/adminpwd.ldif.j2 rename to library/roles/openldap-server/templates/adminpwd.ldif.j2 diff --git a/openldap-server/templates/base-dn.ldif.j2 b/library/roles/openldap-server/templates/base-dn.ldif.j2 similarity index 100% rename from openldap-server/templates/base-dn.ldif.j2 rename to library/roles/openldap-server/templates/base-dn.ldif.j2 diff --git a/openldap-server/templates/consumer.ldif.j2 b/library/roles/openldap-server/templates/consumer.ldif.j2 similarity index 100% rename from openldap-server/templates/consumer.ldif.j2 rename to library/roles/openldap-server/templates/consumer.ldif.j2 diff --git a/openldap-server/templates/ldap_logs_cleaner.sh.j2 b/library/roles/openldap-server/templates/ldap_logs_cleaner.sh.j2 similarity index 100% rename from openldap-server/templates/ldap_logs_cleaner.sh.j2 rename to library/roles/openldap-server/templates/ldap_logs_cleaner.sh.j2 diff --git a/openldap-server/templates/monitor.ldif.j2 b/library/roles/openldap-server/templates/monitor.ldif.j2 similarity index 100% rename from openldap-server/templates/monitor.ldif.j2 rename to library/roles/openldap-server/templates/monitor.ldif.j2 diff --git a/openldap-server/templates/slapd-default.j2 b/library/roles/openldap-server/templates/slapd-default.j2 similarity index 100% rename from openldap-server/templates/slapd-default.j2 rename to library/roles/openldap-server/templates/slapd-default.j2 diff --git a/openldap-server/templates/syncprov.ldif.j2 b/library/roles/openldap-server/templates/syncprov.ldif.j2 similarity index 100% rename from openldap-server/templates/syncprov.ldif.j2 rename to library/roles/openldap-server/templates/syncprov.ldif.j2 diff --git a/openldap-server/vars/main.yml b/library/roles/openldap-server/vars/main.yml similarity index 100% rename from openldap-server/vars/main.yml rename to library/roles/openldap-server/vars/main.yml diff --git a/openvpn/defaults/main.yml b/library/roles/openvpn/defaults/main.yml similarity index 100% rename from openvpn/defaults/main.yml rename to library/roles/openvpn/defaults/main.yml diff --git a/openvpn/files/openvpn-letsencrypt-acme.sh b/library/roles/openvpn/files/openvpn-letsencrypt-acme.sh similarity index 100% rename from openvpn/files/openvpn-letsencrypt-acme.sh rename to library/roles/openvpn/files/openvpn-letsencrypt-acme.sh diff --git a/openvpn/handlers/main.yml b/library/roles/openvpn/handlers/main.yml similarity index 100% rename from openvpn/handlers/main.yml rename to library/roles/openvpn/handlers/main.yml diff --git a/openvpn/tasks/letsencrypt-openvpn.yml b/library/roles/openvpn/tasks/letsencrypt-openvpn.yml similarity index 100% rename from openvpn/tasks/letsencrypt-openvpn.yml rename to library/roles/openvpn/tasks/letsencrypt-openvpn.yml diff --git a/openvpn/tasks/main.yml b/library/roles/openvpn/tasks/main.yml similarity index 100% rename from openvpn/tasks/main.yml rename to library/roles/openvpn/tasks/main.yml diff --git a/openvpn/tasks/openvpn.yml b/library/roles/openvpn/tasks/openvpn.yml similarity index 100% rename from openvpn/tasks/openvpn.yml rename to library/roles/openvpn/tasks/openvpn.yml diff --git a/openvpn/templates/auth-ldap.conf.j2 b/library/roles/openvpn/templates/auth-ldap.conf.j2 similarity index 100% rename from openvpn/templates/auth-ldap.conf.j2 rename to library/roles/openvpn/templates/auth-ldap.conf.j2 diff --git a/openvpn/templates/auth-ldap.pl.j2 b/library/roles/openvpn/templates/auth-ldap.pl.j2 similarity index 100% rename from openvpn/templates/auth-ldap.pl.j2 rename to library/roles/openvpn/templates/auth-ldap.pl.j2 diff --git a/openvpn/templates/client.conf.j2 b/library/roles/openvpn/templates/client.conf.j2 similarity index 100% rename from openvpn/templates/client.conf.j2 rename to library/roles/openvpn/templates/client.conf.j2 diff --git a/openvpn/templates/openvpn-defaults.j2 b/library/roles/openvpn/templates/openvpn-defaults.j2 similarity index 100% rename from openvpn/templates/openvpn-defaults.j2 rename to library/roles/openvpn/templates/openvpn-defaults.j2 diff --git a/openvpn/templates/openvpn.conf.j2 b/library/roles/openvpn/templates/openvpn.conf.j2 similarity index 100% rename from openvpn/templates/openvpn.conf.j2 rename to library/roles/openvpn/templates/openvpn.conf.j2 diff --git a/openvpn/templates/server.conf.j2 b/library/roles/openvpn/templates/server.conf.j2 similarity index 100% rename from openvpn/templates/server.conf.j2 rename to library/roles/openvpn/templates/server.conf.j2 diff --git a/openvpn/templates/user-ccd.conf.j2 b/library/roles/openvpn/templates/user-ccd.conf.j2 similarity index 100% rename from openvpn/templates/user-ccd.conf.j2 rename to library/roles/openvpn/templates/user-ccd.conf.j2 diff --git a/oracle-jdk/defaults/main.yml b/library/roles/oracle-jdk/defaults/main.yml similarity index 100% rename from oracle-jdk/defaults/main.yml rename to library/roles/oracle-jdk/defaults/main.yml diff --git a/oracle-jdk/files/cacerts-jdk7 b/library/roles/oracle-jdk/files/cacerts-jdk7 similarity index 100% rename from oracle-jdk/files/cacerts-jdk7 rename to library/roles/oracle-jdk/files/cacerts-jdk7 diff --git a/oracle-jdk/handlers/main.yml b/library/roles/oracle-jdk/handlers/main.yml similarity index 100% rename from oracle-jdk/handlers/main.yml rename to library/roles/oracle-jdk/handlers/main.yml diff --git a/oracle-jdk/tasks/main.yml b/library/roles/oracle-jdk/tasks/main.yml similarity index 100% rename from oracle-jdk/tasks/main.yml rename to library/roles/oracle-jdk/tasks/main.yml diff --git a/orientdb/defaults/main.yml b/library/roles/orientdb/defaults/main.yml similarity index 100% rename from orientdb/defaults/main.yml rename to library/roles/orientdb/defaults/main.yml diff --git a/orientdb/handlers/main.yml b/library/roles/orientdb/handlers/main.yml similarity index 100% rename from orientdb/handlers/main.yml rename to library/roles/orientdb/handlers/main.yml diff --git a/orientdb/tasks/main.yml b/library/roles/orientdb/tasks/main.yml similarity index 100% rename from orientdb/tasks/main.yml rename to library/roles/orientdb/tasks/main.yml diff --git a/orientdb/templates/automatic-backup.json.j2 b/library/roles/orientdb/templates/automatic-backup.json.j2 similarity index 100% rename from orientdb/templates/automatic-backup.json.j2 rename to library/roles/orientdb/templates/automatic-backup.json.j2 diff --git a/orientdb/templates/default-distributed-db-config.json.j2 b/library/roles/orientdb/templates/default-distributed-db-config.json.j2 similarity index 100% rename from orientdb/templates/default-distributed-db-config.json.j2 rename to library/roles/orientdb/templates/default-distributed-db-config.json.j2 diff --git a/orientdb/templates/hazelcast.xml.j2 b/library/roles/orientdb/templates/hazelcast.xml.j2 similarity index 100% rename from orientdb/templates/hazelcast.xml.j2 rename to library/roles/orientdb/templates/hazelcast.xml.j2 diff --git a/orientdb/templates/orientdb-letsencrypt-acme.sh.j2 b/library/roles/orientdb/templates/orientdb-letsencrypt-acme.sh.j2 similarity index 100% rename from orientdb/templates/orientdb-letsencrypt-acme.sh.j2 rename to library/roles/orientdb/templates/orientdb-letsencrypt-acme.sh.j2 diff --git a/orientdb/templates/orientdb-nrpe.cfg.j2 b/library/roles/orientdb/templates/orientdb-nrpe.cfg.j2 similarity index 100% rename from orientdb/templates/orientdb-nrpe.cfg.j2 rename to library/roles/orientdb/templates/orientdb-nrpe.cfg.j2 diff --git a/orientdb/templates/orientdb-server-config.xml.j2 b/library/roles/orientdb/templates/orientdb-server-config.xml.j2 similarity index 100% rename from orientdb/templates/orientdb-server-config.xml.j2 rename to library/roles/orientdb/templates/orientdb-server-config.xml.j2 diff --git a/orientdb/templates/orientdb-server-log.properties.j2 b/library/roles/orientdb/templates/orientdb-server-log.properties.j2 similarity index 100% rename from orientdb/templates/orientdb-server-log.properties.j2 rename to library/roles/orientdb/templates/orientdb-server-log.properties.j2 diff --git a/orientdb/templates/orientdb.default.j2 b/library/roles/orientdb/templates/orientdb.default.j2 similarity index 100% rename from orientdb/templates/orientdb.default.j2 rename to library/roles/orientdb/templates/orientdb.default.j2 diff --git a/orientdb/templates/orientdb.init.j2 b/library/roles/orientdb/templates/orientdb.init.j2 similarity index 100% rename from orientdb/templates/orientdb.init.j2 rename to library/roles/orientdb/templates/orientdb.init.j2 diff --git a/pandoc/defaults/main.yml b/library/roles/pandoc/defaults/main.yml similarity index 100% rename from pandoc/defaults/main.yml rename to library/roles/pandoc/defaults/main.yml diff --git a/pandoc/tasks/main.yml b/library/roles/pandoc/tasks/main.yml similarity index 100% rename from pandoc/tasks/main.yml rename to library/roles/pandoc/tasks/main.yml diff --git a/parse_server/defaults/main.yml b/library/roles/parse_server/defaults/main.yml similarity index 100% rename from parse_server/defaults/main.yml rename to library/roles/parse_server/defaults/main.yml diff --git a/parse_server/meta/main.yml b/library/roles/parse_server/meta/main.yml similarity index 100% rename from parse_server/meta/main.yml rename to library/roles/parse_server/meta/main.yml diff --git a/parse_server/tasks/main.yml b/library/roles/parse_server/tasks/main.yml similarity index 100% rename from parse_server/tasks/main.yml rename to library/roles/parse_server/tasks/main.yml diff --git a/parse_server/templates/parse-server-dashboard.env b/library/roles/parse_server/templates/parse-server-dashboard.env similarity index 100% rename from parse_server/templates/parse-server-dashboard.env rename to library/roles/parse_server/templates/parse-server-dashboard.env diff --git a/parse_server/templates/parse-server.env b/library/roles/parse_server/templates/parse-server.env similarity index 100% rename from parse_server/templates/parse-server.env rename to library/roles/parse_server/templates/parse-server.env diff --git a/parse_server/templates/parse_server.upstart.j2 b/library/roles/parse_server/templates/parse_server.upstart.j2 similarity index 100% rename from parse_server/templates/parse_server.upstart.j2 rename to library/roles/parse_server/templates/parse_server.upstart.j2 diff --git a/parse_server/templates/parse_server_dashboard.upstart.j2 b/library/roles/parse_server/templates/parse_server_dashboard.upstart.j2 similarity index 100% rename from parse_server/templates/parse_server_dashboard.upstart.j2 rename to library/roles/parse_server/templates/parse_server_dashboard.upstart.j2 diff --git a/parse_server/vars/main.yml b/library/roles/parse_server/vars/main.yml similarity index 100% rename from parse_server/vars/main.yml rename to library/roles/parse_server/vars/main.yml diff --git a/php-fpm/defaults/main.yml b/library/roles/php-fpm/defaults/main.yml similarity index 100% rename from php-fpm/defaults/main.yml rename to library/roles/php-fpm/defaults/main.yml diff --git a/php-fpm/handlers/main.yml b/library/roles/php-fpm/handlers/main.yml similarity index 100% rename from php-fpm/handlers/main.yml rename to library/roles/php-fpm/handlers/main.yml diff --git a/php-fpm/tasks/main.yml b/library/roles/php-fpm/tasks/main.yml similarity index 100% rename from php-fpm/tasks/main.yml rename to library/roles/php-fpm/tasks/main.yml diff --git a/php-fpm/templates/php-fpm-pool.conf.j2 b/library/roles/php-fpm/templates/php-fpm-pool.conf.j2 similarity index 100% rename from php-fpm/templates/php-fpm-pool.conf.j2 rename to library/roles/php-fpm/templates/php-fpm-pool.conf.j2 diff --git a/php-fpm/templates/php-fpm.conf.j2 b/library/roles/php-fpm/templates/php-fpm.conf.j2 similarity index 100% rename from php-fpm/templates/php-fpm.conf.j2 rename to library/roles/php-fpm/templates/php-fpm.conf.j2 diff --git a/php-fpm/templates/php-fpm.logrotate.j2 b/library/roles/php-fpm/templates/php-fpm.logrotate.j2 similarity index 100% rename from php-fpm/templates/php-fpm.logrotate.j2 rename to library/roles/php-fpm/templates/php-fpm.logrotate.j2 diff --git a/piwik/defaults/main.yml b/library/roles/piwik/defaults/main.yml similarity index 100% rename from piwik/defaults/main.yml rename to library/roles/piwik/defaults/main.yml diff --git a/piwik/tasks/main.yml b/library/roles/piwik/tasks/main.yml similarity index 100% rename from piwik/tasks/main.yml rename to library/roles/piwik/tasks/main.yml diff --git a/piwik/templates/piwik-archive.cron.j2 b/library/roles/piwik/templates/piwik-archive.cron.j2 similarity index 100% rename from piwik/templates/piwik-archive.cron.j2 rename to library/roles/piwik/templates/piwik-archive.cron.j2 diff --git a/postfix-relay/defaults/main.yml b/library/roles/postfix-relay/defaults/main.yml similarity index 100% rename from postfix-relay/defaults/main.yml rename to library/roles/postfix-relay/defaults/main.yml diff --git a/postfix-relay/files/check_postfix_mailqueue b/library/roles/postfix-relay/files/check_postfix_mailqueue similarity index 100% rename from postfix-relay/files/check_postfix_mailqueue rename to library/roles/postfix-relay/files/check_postfix_mailqueue diff --git a/postfix-relay/files/check_postfix_processed b/library/roles/postfix-relay/files/check_postfix_processed similarity index 100% rename from postfix-relay/files/check_postfix_processed rename to library/roles/postfix-relay/files/check_postfix_processed diff --git a/postfix-relay/files/sasl_smtpd.conf b/library/roles/postfix-relay/files/sasl_smtpd.conf similarity index 100% rename from postfix-relay/files/sasl_smtpd.conf rename to library/roles/postfix-relay/files/sasl_smtpd.conf diff --git a/postfix-relay/handlers/main.yml b/library/roles/postfix-relay/handlers/main.yml similarity index 100% rename from postfix-relay/handlers/main.yml rename to library/roles/postfix-relay/handlers/main.yml diff --git a/postfix-relay/meta/main.yml b/library/roles/postfix-relay/meta/main.yml similarity index 100% rename from postfix-relay/meta/main.yml rename to library/roles/postfix-relay/meta/main.yml diff --git a/postfix-relay/tasks/main.yml b/library/roles/postfix-relay/tasks/main.yml similarity index 100% rename from postfix-relay/tasks/main.yml rename to library/roles/postfix-relay/tasks/main.yml diff --git a/postfix-relay/tasks/postfix-letsencrypt-hook.yml b/library/roles/postfix-relay/tasks/postfix-letsencrypt-hook.yml similarity index 100% rename from postfix-relay/tasks/postfix-letsencrypt-hook.yml rename to library/roles/postfix-relay/tasks/postfix-letsencrypt-hook.yml diff --git a/postfix-relay/tasks/postfix-relay-server.yml b/library/roles/postfix-relay/tasks/postfix-relay-server.yml similarity index 100% rename from postfix-relay/tasks/postfix-relay-server.yml rename to library/roles/postfix-relay/tasks/postfix-relay-server.yml diff --git a/postfix-relay/tasks/smtp-common-packages.yml b/library/roles/postfix-relay/tasks/smtp-common-packages.yml similarity index 100% rename from postfix-relay/tasks/smtp-common-packages.yml rename to library/roles/postfix-relay/tasks/smtp-common-packages.yml diff --git a/postfix-relay/tasks/smtp-sasl-auth.yml b/library/roles/postfix-relay/tasks/smtp-sasl-auth.yml similarity index 100% rename from postfix-relay/tasks/smtp-sasl-auth.yml rename to library/roles/postfix-relay/tasks/smtp-sasl-auth.yml diff --git a/postfix-relay/templates/mailname.j2 b/library/roles/postfix-relay/templates/mailname.j2 similarity index 100% rename from postfix-relay/templates/mailname.j2 rename to library/roles/postfix-relay/templates/mailname.j2 diff --git a/postfix-relay/templates/main.cf.j2 b/library/roles/postfix-relay/templates/main.cf.j2 similarity index 100% rename from postfix-relay/templates/main.cf.j2 rename to library/roles/postfix-relay/templates/main.cf.j2 diff --git a/postfix-relay/templates/network_table.j2 b/library/roles/postfix-relay/templates/network_table.j2 similarity index 100% rename from postfix-relay/templates/network_table.j2 rename to library/roles/postfix-relay/templates/network_table.j2 diff --git a/postfix-relay/templates/postfix-letsencrypt-hook b/library/roles/postfix-relay/templates/postfix-letsencrypt-hook similarity index 100% rename from postfix-relay/templates/postfix-letsencrypt-hook rename to library/roles/postfix-relay/templates/postfix-letsencrypt-hook diff --git a/postfix-relay/templates/postfix-master.cf.j2 b/library/roles/postfix-relay/templates/postfix-master.cf.j2 similarity index 100% rename from postfix-relay/templates/postfix-master.cf.j2 rename to library/roles/postfix-relay/templates/postfix-master.cf.j2 diff --git a/postfix-relay/templates/postfix-nrpe.cfg.j2 b/library/roles/postfix-relay/templates/postfix-nrpe.cfg.j2 similarity index 100% rename from postfix-relay/templates/postfix-nrpe.cfg.j2 rename to library/roles/postfix-relay/templates/postfix-nrpe.cfg.j2 diff --git a/postfix-relay/templates/sasl_passwd.j2 b/library/roles/postfix-relay/templates/sasl_passwd.j2 similarity index 100% rename from postfix-relay/templates/sasl_passwd.j2 rename to library/roles/postfix-relay/templates/sasl_passwd.j2 diff --git a/postgresql-db/defaults/main.yml b/library/roles/postgresql-db/defaults/main.yml similarity index 100% rename from postgresql-db/defaults/main.yml rename to library/roles/postgresql-db/defaults/main.yml diff --git a/postgresql-db/handlers/main.yml b/library/roles/postgresql-db/handlers/main.yml similarity index 100% rename from postgresql-db/handlers/main.yml rename to library/roles/postgresql-db/handlers/main.yml diff --git a/postgresql-db/tasks/configure-access.yml b/library/roles/postgresql-db/tasks/configure-access.yml similarity index 100% rename from postgresql-db/tasks/configure-access.yml rename to library/roles/postgresql-db/tasks/configure-access.yml diff --git a/postgresql-db/tasks/db_extensions.yml b/library/roles/postgresql-db/tasks/db_extensions.yml similarity index 100% rename from postgresql-db/tasks/db_extensions.yml rename to library/roles/postgresql-db/tasks/db_extensions.yml diff --git a/postgresql-db/tasks/db_schemas.yml b/library/roles/postgresql-db/tasks/db_schemas.yml similarity index 100% rename from postgresql-db/tasks/db_schemas.yml rename to library/roles/postgresql-db/tasks/db_schemas.yml diff --git a/postgresql-db/tasks/main.yml b/library/roles/postgresql-db/tasks/main.yml similarity index 100% rename from postgresql-db/tasks/main.yml rename to library/roles/postgresql-db/tasks/main.yml diff --git a/postgresql-db/tasks/manage_dbs.yml b/library/roles/postgresql-db/tasks/manage_dbs.yml similarity index 100% rename from postgresql-db/tasks/manage_dbs.yml rename to library/roles/postgresql-db/tasks/manage_dbs.yml diff --git a/postgresql-db/vars/main.yml b/library/roles/postgresql-db/vars/main.yml similarity index 100% rename from postgresql-db/vars/main.yml rename to library/roles/postgresql-db/vars/main.yml diff --git a/postgresql/defaults/main.yml b/library/roles/postgresql/defaults/main.yml similarity index 100% rename from postgresql/defaults/main.yml rename to library/roles/postgresql/defaults/main.yml diff --git a/postgresql/files/arping_script b/library/roles/postgresql/files/arping_script similarity index 100% rename from postgresql/files/arping_script rename to library/roles/postgresql/files/arping_script diff --git a/postgresql/files/ip_script b/library/roles/postgresql/files/ip_script similarity index 100% rename from postgresql/files/ip_script rename to library/roles/postgresql/files/ip_script diff --git a/postgresql/files/pgpool-letsencrypt-acme.sh b/library/roles/postgresql/files/pgpool-letsencrypt-acme.sh similarity index 100% rename from postgresql/files/pgpool-letsencrypt-acme.sh rename to library/roles/postgresql/files/pgpool-letsencrypt-acme.sh diff --git a/postgresql/files/postgresql-backup.cron b/library/roles/postgresql/files/postgresql-backup.cron similarity index 100% rename from postgresql/files/postgresql-backup.cron rename to library/roles/postgresql/files/postgresql-backup.cron diff --git a/postgresql/files/postgresql-backup.sh b/library/roles/postgresql/files/postgresql-backup.sh similarity index 100% rename from postgresql/files/postgresql-backup.sh rename to library/roles/postgresql/files/postgresql-backup.sh diff --git a/postgresql/files/postgresql-letsencrypt-acme.sh b/library/roles/postgresql/files/postgresql-letsencrypt-acme.sh similarity index 100% rename from postgresql/files/postgresql-letsencrypt-acme.sh rename to library/roles/postgresql/files/postgresql-letsencrypt-acme.sh diff --git a/postgresql/handlers/main.yml b/library/roles/postgresql/handlers/main.yml similarity index 100% rename from postgresql/handlers/main.yml rename to library/roles/postgresql/handlers/main.yml diff --git a/postgresql/tasks/configure-access.yml b/library/roles/postgresql/tasks/configure-access.yml similarity index 100% rename from postgresql/tasks/configure-access.yml rename to library/roles/postgresql/tasks/configure-access.yml diff --git a/postgresql/tasks/main.yml b/library/roles/postgresql/tasks/main.yml similarity index 100% rename from postgresql/tasks/main.yml rename to library/roles/postgresql/tasks/main.yml diff --git a/postgresql/tasks/manage_pg_db.yml b/library/roles/postgresql/tasks/manage_pg_db.yml similarity index 100% rename from postgresql/tasks/manage_pg_db.yml rename to library/roles/postgresql/tasks/manage_pg_db.yml diff --git a/postgresql/tasks/packages.yml b/library/roles/postgresql/tasks/packages.yml similarity index 100% rename from postgresql/tasks/packages.yml rename to library/roles/postgresql/tasks/packages.yml diff --git a/postgresql/tasks/pgpool-ii.yml b/library/roles/postgresql/tasks/pgpool-ii.yml similarity index 100% rename from postgresql/tasks/pgpool-ii.yml rename to library/roles/postgresql/tasks/pgpool-ii.yml diff --git a/postgresql/tasks/pgpool-letsencrypt-acmetool.yml b/library/roles/postgresql/tasks/pgpool-letsencrypt-acmetool.yml similarity index 100% rename from postgresql/tasks/pgpool-letsencrypt-acmetool.yml rename to library/roles/postgresql/tasks/pgpool-letsencrypt-acmetool.yml diff --git a/postgresql/tasks/postgis.yml b/library/roles/postgresql/tasks/postgis.yml similarity index 100% rename from postgresql/tasks/postgis.yml rename to library/roles/postgresql/tasks/postgis.yml diff --git a/postgresql/tasks/postgres_pgpool.yml b/library/roles/postgresql/tasks/postgres_pgpool.yml similarity index 100% rename from postgresql/tasks/postgres_pgpool.yml rename to library/roles/postgresql/tasks/postgres_pgpool.yml diff --git a/postgresql/tasks/postgresql-backup.yml b/library/roles/postgresql/tasks/postgresql-backup.yml similarity index 100% rename from postgresql/tasks/postgresql-backup.yml rename to library/roles/postgresql/tasks/postgresql-backup.yml diff --git a/postgresql/tasks/postgresql-config.yml b/library/roles/postgresql/tasks/postgresql-config.yml similarity index 100% rename from postgresql/tasks/postgresql-config.yml rename to library/roles/postgresql/tasks/postgresql-config.yml diff --git a/postgresql/tasks/postgresql-letsencrypt-acmetool.yml b/library/roles/postgresql/tasks/postgresql-letsencrypt-acmetool.yml similarity index 100% rename from postgresql/tasks/postgresql-letsencrypt-acmetool.yml rename to library/roles/postgresql/tasks/postgresql-letsencrypt-acmetool.yml diff --git a/postgresql/tasks/postgresql-service-status.yml b/library/roles/postgresql/tasks/postgresql-service-status.yml similarity index 100% rename from postgresql/tasks/postgresql-service-status.yml rename to library/roles/postgresql/tasks/postgresql-service-status.yml diff --git a/postgresql/tasks/postgresql-ssl-config.yml b/library/roles/postgresql/tasks/postgresql-ssl-config.yml similarity index 100% rename from postgresql/tasks/postgresql-ssl-config.yml rename to library/roles/postgresql/tasks/postgresql-ssl-config.yml diff --git a/postgresql/tasks/postgresql_org_repo.yml b/library/roles/postgresql/tasks/postgresql_org_repo.yml similarity index 100% rename from postgresql/tasks/postgresql_org_repo.yml rename to library/roles/postgresql/tasks/postgresql_org_repo.yml diff --git a/postgresql/tasks/psql-kernel-sharedmem.yml b/library/roles/postgresql/tasks/psql-kernel-sharedmem.yml similarity index 100% rename from postgresql/tasks/psql-kernel-sharedmem.yml rename to library/roles/postgresql/tasks/psql-kernel-sharedmem.yml diff --git a/postgresql/templates/pcp.conf.j2 b/library/roles/postgresql/templates/pcp.conf.j2 similarity index 100% rename from postgresql/templates/pcp.conf.j2 rename to library/roles/postgresql/templates/pcp.conf.j2 diff --git a/postgresql/templates/pg_backup-default.j2 b/library/roles/postgresql/templates/pg_backup-default.j2 similarity index 100% rename from postgresql/templates/pg_backup-default.j2 rename to library/roles/postgresql/templates/pg_backup-default.j2 diff --git a/postgresql/templates/pgpass.j2 b/library/roles/postgresql/templates/pgpass.j2 similarity index 100% rename from postgresql/templates/pgpass.j2 rename to library/roles/postgresql/templates/pgpass.j2 diff --git a/postgresql/templates/pgpool-wd-sudoers.j2 b/library/roles/postgresql/templates/pgpool-wd-sudoers.j2 similarity index 100% rename from postgresql/templates/pgpool-wd-sudoers.j2 rename to library/roles/postgresql/templates/pgpool-wd-sudoers.j2 diff --git a/postgresql/templates/pgpool.conf.j2 b/library/roles/postgresql/templates/pgpool.conf.j2 similarity index 100% rename from postgresql/templates/pgpool.conf.j2 rename to library/roles/postgresql/templates/pgpool.conf.j2 diff --git a/postgresql/templates/pgpool_recovery_stage_1.j2 b/library/roles/postgresql/templates/pgpool_recovery_stage_1.j2 similarity index 100% rename from postgresql/templates/pgpool_recovery_stage_1.j2 rename to library/roles/postgresql/templates/pgpool_recovery_stage_1.j2 diff --git a/postgresql/templates/pgpool_recovery_stage_2.j2 b/library/roles/postgresql/templates/pgpool_recovery_stage_2.j2 similarity index 100% rename from postgresql/templates/pgpool_recovery_stage_2.j2 rename to library/roles/postgresql/templates/pgpool_recovery_stage_2.j2 diff --git a/postgresql/templates/pgpool_remote_start.j2 b/library/roles/postgresql/templates/pgpool_remote_start.j2 similarity index 100% rename from postgresql/templates/pgpool_remote_start.j2 rename to library/roles/postgresql/templates/pgpool_remote_start.j2 diff --git a/postgresql/templates/postgresql-sudoers.j2 b/library/roles/postgresql/templates/postgresql-sudoers.j2 similarity index 100% rename from postgresql/templates/postgresql-sudoers.j2 rename to library/roles/postgresql/templates/postgresql-sudoers.j2 diff --git a/postgresql/templates/postgresql_wal_backup_and_removal.j2 b/library/roles/postgresql/templates/postgresql_wal_backup_and_removal.j2 similarity index 100% rename from postgresql/templates/postgresql_wal_backup_and_removal.j2 rename to library/roles/postgresql/templates/postgresql_wal_backup_and_removal.j2 diff --git a/postgresql_extensions/tasks/main.yml b/library/roles/postgresql_extensions/tasks/main.yml similarity index 100% rename from postgresql_extensions/tasks/main.yml rename to library/roles/postgresql_extensions/tasks/main.yml diff --git a/powerdns-admin/defaults/main.yml b/library/roles/powerdns-admin/defaults/main.yml similarity index 100% rename from powerdns-admin/defaults/main.yml rename to library/roles/powerdns-admin/defaults/main.yml diff --git a/powerdns-admin/handlers/main.yml b/library/roles/powerdns-admin/handlers/main.yml similarity index 100% rename from powerdns-admin/handlers/main.yml rename to library/roles/powerdns-admin/handlers/main.yml diff --git a/powerdns-admin/meta/main.yml b/library/roles/powerdns-admin/meta/main.yml similarity index 100% rename from powerdns-admin/meta/main.yml rename to library/roles/powerdns-admin/meta/main.yml diff --git a/powerdns-admin/tasks/main.yml b/library/roles/powerdns-admin/tasks/main.yml similarity index 100% rename from powerdns-admin/tasks/main.yml rename to library/roles/powerdns-admin/tasks/main.yml diff --git a/powerdns-admin/templates/config.py b/library/roles/powerdns-admin/templates/config.py similarity index 100% rename from powerdns-admin/templates/config.py rename to library/roles/powerdns-admin/templates/config.py diff --git a/powerdns-admin/templates/powerdns-admin.service b/library/roles/powerdns-admin/templates/powerdns-admin.service similarity index 100% rename from powerdns-admin/templates/powerdns-admin.service rename to library/roles/powerdns-admin/templates/powerdns-admin.service diff --git a/powerdns-admin/vars/main.yml b/library/roles/powerdns-admin/vars/main.yml similarity index 100% rename from powerdns-admin/vars/main.yml rename to library/roles/powerdns-admin/vars/main.yml diff --git a/powerdns-authoritative/defaults/main.yml b/library/roles/powerdns-authoritative/defaults/main.yml similarity index 100% rename from powerdns-authoritative/defaults/main.yml rename to library/roles/powerdns-authoritative/defaults/main.yml diff --git a/powerdns-authoritative/handlers/main.yml b/library/roles/powerdns-authoritative/handlers/main.yml similarity index 100% rename from powerdns-authoritative/handlers/main.yml rename to library/roles/powerdns-authoritative/handlers/main.yml diff --git a/powerdns-authoritative/tasks/main.yml b/library/roles/powerdns-authoritative/tasks/main.yml similarity index 100% rename from powerdns-authoritative/tasks/main.yml rename to library/roles/powerdns-authoritative/tasks/main.yml diff --git a/powerdns-authoritative/templates/pdns.conf b/library/roles/powerdns-authoritative/templates/pdns.conf similarity index 100% rename from powerdns-authoritative/templates/pdns.conf rename to library/roles/powerdns-authoritative/templates/pdns.conf diff --git a/powerdns-authoritative/templates/pdns.local.conf b/library/roles/powerdns-authoritative/templates/pdns.local.conf similarity index 100% rename from powerdns-authoritative/templates/pdns.local.conf rename to library/roles/powerdns-authoritative/templates/pdns.local.conf diff --git a/prometheus-haproxy-exporter/defaults/main.yml b/library/roles/prometheus-haproxy-exporter/defaults/main.yml similarity index 100% rename from prometheus-haproxy-exporter/defaults/main.yml rename to library/roles/prometheus-haproxy-exporter/defaults/main.yml diff --git a/prometheus-haproxy-exporter/handlers/main.yml b/library/roles/prometheus-haproxy-exporter/handlers/main.yml similarity index 100% rename from prometheus-haproxy-exporter/handlers/main.yml rename to library/roles/prometheus-haproxy-exporter/handlers/main.yml diff --git a/prometheus-haproxy-exporter/tasks/main.yml b/library/roles/prometheus-haproxy-exporter/tasks/main.yml similarity index 100% rename from prometheus-haproxy-exporter/tasks/main.yml rename to library/roles/prometheus-haproxy-exporter/tasks/main.yml diff --git a/prometheus-haproxy-exporter/templates/haproxy_exporter.systemd.j2 b/library/roles/prometheus-haproxy-exporter/templates/haproxy_exporter.systemd.j2 similarity index 100% rename from prometheus-haproxy-exporter/templates/haproxy_exporter.systemd.j2 rename to library/roles/prometheus-haproxy-exporter/templates/haproxy_exporter.systemd.j2 diff --git a/prometheus-haproxy-exporter/templates/haproxy_exporter.upstart.j2 b/library/roles/prometheus-haproxy-exporter/templates/haproxy_exporter.upstart.j2 similarity index 100% rename from prometheus-haproxy-exporter/templates/haproxy_exporter.upstart.j2 rename to library/roles/prometheus-haproxy-exporter/templates/haproxy_exporter.upstart.j2 diff --git a/prometheus-node-exporter/defaults/main.yml b/library/roles/prometheus-node-exporter/defaults/main.yml similarity index 100% rename from prometheus-node-exporter/defaults/main.yml rename to library/roles/prometheus-node-exporter/defaults/main.yml diff --git a/prometheus-node-exporter/handlers/main.yml b/library/roles/prometheus-node-exporter/handlers/main.yml similarity index 100% rename from prometheus-node-exporter/handlers/main.yml rename to library/roles/prometheus-node-exporter/handlers/main.yml diff --git a/prometheus-node-exporter/tasks/main.yml b/library/roles/prometheus-node-exporter/tasks/main.yml similarity index 100% rename from prometheus-node-exporter/tasks/main.yml rename to library/roles/prometheus-node-exporter/tasks/main.yml diff --git a/prometheus-node-exporter/templates/node_exporter.systemd.j2 b/library/roles/prometheus-node-exporter/templates/node_exporter.systemd.j2 similarity index 100% rename from prometheus-node-exporter/templates/node_exporter.systemd.j2 rename to library/roles/prometheus-node-exporter/templates/node_exporter.systemd.j2 diff --git a/prometheus-node-exporter/templates/node_exporter.upstart.j2 b/library/roles/prometheus-node-exporter/templates/node_exporter.upstart.j2 similarity index 100% rename from prometheus-node-exporter/templates/node_exporter.upstart.j2 rename to library/roles/prometheus-node-exporter/templates/node_exporter.upstart.j2 diff --git a/prometheus/defaults/main.yml b/library/roles/prometheus/defaults/main.yml similarity index 100% rename from prometheus/defaults/main.yml rename to library/roles/prometheus/defaults/main.yml diff --git a/prometheus/files/prometheus.upstart b/library/roles/prometheus/files/prometheus.upstart similarity index 100% rename from prometheus/files/prometheus.upstart rename to library/roles/prometheus/files/prometheus.upstart diff --git a/prometheus/handlers/main.yml b/library/roles/prometheus/handlers/main.yml similarity index 100% rename from prometheus/handlers/main.yml rename to library/roles/prometheus/handlers/main.yml diff --git a/prometheus/meta/main.yml b/library/roles/prometheus/meta/main.yml similarity index 100% rename from prometheus/meta/main.yml rename to library/roles/prometheus/meta/main.yml diff --git a/prometheus/tasks/main.yml b/library/roles/prometheus/tasks/main.yml similarity index 100% rename from prometheus/tasks/main.yml rename to library/roles/prometheus/tasks/main.yml diff --git a/prometheus/templates/prometheus.default.j2 b/library/roles/prometheus/templates/prometheus.default.j2 similarity index 100% rename from prometheus/templates/prometheus.default.j2 rename to library/roles/prometheus/templates/prometheus.default.j2 diff --git a/prometheus/templates/prometheus.systemd b/library/roles/prometheus/templates/prometheus.systemd similarity index 100% rename from prometheus/templates/prometheus.systemd rename to library/roles/prometheus/templates/prometheus.systemd diff --git a/prometheus/templates/prometheus.yml.j2 b/library/roles/prometheus/templates/prometheus.yml.j2 similarity index 100% rename from prometheus/templates/prometheus.yml.j2 rename to library/roles/prometheus/templates/prometheus.yml.j2 diff --git a/prometheus/vars/main.yml b/library/roles/prometheus/vars/main.yml similarity index 100% rename from prometheus/vars/main.yml rename to library/roles/prometheus/vars/main.yml diff --git a/python-env/defaults/main.yml b/library/roles/python-env/defaults/main.yml similarity index 100% rename from python-env/defaults/main.yml rename to library/roles/python-env/defaults/main.yml diff --git a/python-env/meta/main.yml b/library/roles/python-env/meta/main.yml similarity index 100% rename from python-env/meta/main.yml rename to library/roles/python-env/meta/main.yml diff --git a/python-env/tasks/main.yml b/library/roles/python-env/tasks/main.yml similarity index 100% rename from python-env/tasks/main.yml rename to library/roles/python-env/tasks/main.yml diff --git a/python-virtualenv/defaults/main.yml b/library/roles/python-virtualenv/defaults/main.yml similarity index 100% rename from python-virtualenv/defaults/main.yml rename to library/roles/python-virtualenv/defaults/main.yml diff --git a/python-virtualenv/tasks/main.yml b/library/roles/python-virtualenv/tasks/main.yml similarity index 100% rename from python-virtualenv/tasks/main.yml rename to library/roles/python-virtualenv/tasks/main.yml diff --git a/python3-env/defaults/main.yml b/library/roles/python3-env/defaults/main.yml similarity index 100% rename from python3-env/defaults/main.yml rename to library/roles/python3-env/defaults/main.yml diff --git a/python3-env/tasks/main.yml b/library/roles/python3-env/tasks/main.yml similarity index 100% rename from python3-env/tasks/main.yml rename to library/roles/python3-env/tasks/main.yml diff --git a/quickrank/defaults/main.yml b/library/roles/quickrank/defaults/main.yml similarity index 100% rename from quickrank/defaults/main.yml rename to library/roles/quickrank/defaults/main.yml diff --git a/quickrank/files/CMakeLists.txt.12.04.diff b/library/roles/quickrank/files/CMakeLists.txt.12.04.diff similarity index 100% rename from quickrank/files/CMakeLists.txt.12.04.diff rename to library/roles/quickrank/files/CMakeLists.txt.12.04.diff diff --git a/quickrank/files/QuickRankMakeRulesOverwrite.cmake b/library/roles/quickrank/files/QuickRankMakeRulesOverwrite.cmake similarity index 100% rename from quickrank/files/QuickRankMakeRulesOverwrite.cmake rename to library/roles/quickrank/files/QuickRankMakeRulesOverwrite.cmake diff --git a/quickrank/tasks/main.yml b/library/roles/quickrank/tasks/main.yml similarity index 100% rename from quickrank/tasks/main.yml rename to library/roles/quickrank/tasks/main.yml diff --git a/rabbitmq/defaults/main.yml b/library/roles/rabbitmq/defaults/main.yml similarity index 100% rename from rabbitmq/defaults/main.yml rename to library/roles/rabbitmq/defaults/main.yml diff --git a/rabbitmq/handlers/main.yml b/library/roles/rabbitmq/handlers/main.yml similarity index 100% rename from rabbitmq/handlers/main.yml rename to library/roles/rabbitmq/handlers/main.yml diff --git a/rabbitmq/tasks/main.yml b/library/roles/rabbitmq/tasks/main.yml similarity index 100% rename from rabbitmq/tasks/main.yml rename to library/roles/rabbitmq/tasks/main.yml diff --git a/redis/defaults/main.yml b/library/roles/redis/defaults/main.yml similarity index 100% rename from redis/defaults/main.yml rename to library/roles/redis/defaults/main.yml diff --git a/redis/handlers/main.yml b/library/roles/redis/handlers/main.yml similarity index 100% rename from redis/handlers/main.yml rename to library/roles/redis/handlers/main.yml diff --git a/redis/tasks/main.yml b/library/roles/redis/tasks/main.yml similarity index 100% rename from redis/tasks/main.yml rename to library/roles/redis/tasks/main.yml diff --git a/redis/templates/redis.conf.j2 b/library/roles/redis/templates/redis.conf.j2 similarity index 100% rename from redis/templates/redis.conf.j2 rename to library/roles/redis/templates/redis.conf.j2 diff --git a/redmine/README b/library/roles/redmine/README similarity index 100% rename from redmine/README rename to library/roles/redmine/README diff --git a/redmine/defaults/main.yml b/library/roles/redmine/defaults/main.yml similarity index 100% rename from redmine/defaults/main.yml rename to library/roles/redmine/defaults/main.yml diff --git a/redmine/files/a1-theme.zip b/library/roles/redmine/files/a1-theme.zip similarity index 100% rename from redmine/files/a1-theme.zip rename to library/roles/redmine/files/a1-theme.zip diff --git a/redmine/files/circle-theme.zip b/library/roles/redmine/files/circle-theme.zip similarity index 100% rename from redmine/files/circle-theme.zip rename to library/roles/redmine/files/circle-theme.zip diff --git a/redmine/files/global_roles.zip b/library/roles/redmine/files/global_roles.zip similarity index 100% rename from redmine/files/global_roles.zip rename to library/roles/redmine/files/global_roles.zip diff --git a/redmine/files/mod-passenger.load b/library/roles/redmine/files/mod-passenger.load similarity index 100% rename from redmine/files/mod-passenger.load rename to library/roles/redmine/files/mod-passenger.load diff --git a/redmine/files/redmine.init b/library/roles/redmine/files/redmine.init similarity index 100% rename from redmine/files/redmine.init rename to library/roles/redmine/files/redmine.init diff --git a/redmine/files/redmine_agile.zip b/library/roles/redmine/files/redmine_agile.zip similarity index 100% rename from redmine/files/redmine_agile.zip rename to library/roles/redmine/files/redmine_agile.zip diff --git a/redmine/files/unread_issues.zip b/library/roles/redmine/files/unread_issues.zip similarity index 100% rename from redmine/files/unread_issues.zip rename to library/roles/redmine/files/unread_issues.zip diff --git a/redmine/files/usability.zip b/library/roles/redmine/files/usability.zip similarity index 100% rename from redmine/files/usability.zip rename to library/roles/redmine/files/usability.zip diff --git a/redmine/handlers/main.yml b/library/roles/redmine/handlers/main.yml similarity index 100% rename from redmine/handlers/main.yml rename to library/roles/redmine/handlers/main.yml diff --git a/redmine/meta/main.yml b/library/roles/redmine/meta/main.yml similarity index 100% rename from redmine/meta/main.yml rename to library/roles/redmine/meta/main.yml diff --git a/redmine/tasks/base-config.yml b/library/roles/redmine/tasks/base-config.yml similarity index 100% rename from redmine/tasks/base-config.yml rename to library/roles/redmine/tasks/base-config.yml diff --git a/redmine/tasks/base-packages.yml b/library/roles/redmine/tasks/base-packages.yml similarity index 100% rename from redmine/tasks/base-packages.yml rename to library/roles/redmine/tasks/base-packages.yml diff --git a/redmine/tasks/main.yml b/library/roles/redmine/tasks/main.yml similarity index 100% rename from redmine/tasks/main.yml rename to library/roles/redmine/tasks/main.yml diff --git a/redmine/tasks/mod_passenger.yml b/library/roles/redmine/tasks/mod_passenger.yml similarity index 100% rename from redmine/tasks/mod_passenger.yml rename to library/roles/redmine/tasks/mod_passenger.yml diff --git a/redmine/tasks/redmine-plugins.yml b/library/roles/redmine/tasks/redmine-plugins.yml similarity index 100% rename from redmine/tasks/redmine-plugins.yml rename to library/roles/redmine/tasks/redmine-plugins.yml diff --git a/redmine/tasks/redmine.yml b/library/roles/redmine/tasks/redmine.yml similarity index 100% rename from redmine/tasks/redmine.yml rename to library/roles/redmine/tasks/redmine.yml diff --git a/redmine/tasks/rubygems.yml b/library/roles/redmine/tasks/rubygems.yml similarity index 100% rename from redmine/tasks/rubygems.yml rename to library/roles/redmine/tasks/rubygems.yml diff --git a/redmine/tasks/unicorn.yml b/library/roles/redmine/tasks/unicorn.yml similarity index 100% rename from redmine/tasks/unicorn.yml rename to library/roles/redmine/tasks/unicorn.yml diff --git a/redmine/templates/nginx_unicorn.conf b/library/roles/redmine/templates/nginx_unicorn.conf similarity index 100% rename from redmine/templates/nginx_unicorn.conf rename to library/roles/redmine/templates/nginx_unicorn.conf diff --git a/redmine/templates/redmine-configuration.yml.j2 b/library/roles/redmine/templates/redmine-configuration.yml.j2 similarity index 100% rename from redmine/templates/redmine-configuration.yml.j2 rename to library/roles/redmine/templates/redmine-configuration.yml.j2 diff --git a/redmine/templates/redmine-database.yml.j2 b/library/roles/redmine/templates/redmine-database.yml.j2 similarity index 100% rename from redmine/templates/redmine-database.yml.j2 rename to library/roles/redmine/templates/redmine-database.yml.j2 diff --git a/redmine/templates/redmine-ldap-sync.cron.j2 b/library/roles/redmine/templates/redmine-ldap-sync.cron.j2 similarity index 100% rename from redmine/templates/redmine-ldap-sync.cron.j2 rename to library/roles/redmine/templates/redmine-ldap-sync.cron.j2 diff --git a/redmine/templates/redmine-logrotate.j2 b/library/roles/redmine/templates/redmine-logrotate.j2 similarity index 100% rename from redmine/templates/redmine-logrotate.j2 rename to library/roles/redmine/templates/redmine-logrotate.j2 diff --git a/redmine/templates/redmine-recurring-tasks.cron.j2 b/library/roles/redmine/templates/redmine-recurring-tasks.cron.j2 similarity index 100% rename from redmine/templates/redmine-recurring-tasks.cron.j2 rename to library/roles/redmine/templates/redmine-recurring-tasks.cron.j2 diff --git a/redmine/templates/redmine_additional_environment.rb.j2 b/library/roles/redmine/templates/redmine_additional_environment.rb.j2 similarity index 100% rename from redmine/templates/redmine_additional_environment.rb.j2 rename to library/roles/redmine/templates/redmine_additional_environment.rb.j2 diff --git a/redmine/templates/redmine_issue_reminder.cron.j2 b/library/roles/redmine/templates/redmine_issue_reminder.cron.j2 similarity index 100% rename from redmine/templates/redmine_issue_reminder.cron.j2 rename to library/roles/redmine/templates/redmine_issue_reminder.cron.j2 diff --git a/redmine/templates/redmine_update_reminder.cron.j2 b/library/roles/redmine/templates/redmine_update_reminder.cron.j2 similarity index 100% rename from redmine/templates/redmine_update_reminder.cron.j2 rename to library/roles/redmine/templates/redmine_update_reminder.cron.j2 diff --git a/redmine/templates/systemd_unicorn.service b/library/roles/redmine/templates/systemd_unicorn.service similarity index 100% rename from redmine/templates/systemd_unicorn.service rename to library/roles/redmine/templates/systemd_unicorn.service diff --git a/redmine/templates/unicorn-logrotate.j2 b/library/roles/redmine/templates/unicorn-logrotate.j2 similarity index 100% rename from redmine/templates/unicorn-logrotate.j2 rename to library/roles/redmine/templates/unicorn-logrotate.j2 diff --git a/redmine/templates/unicorn-redmine.default.j2 b/library/roles/redmine/templates/unicorn-redmine.default.j2 similarity index 100% rename from redmine/templates/unicorn-redmine.default.j2 rename to library/roles/redmine/templates/unicorn-redmine.default.j2 diff --git a/redmine/templates/unicorn.conf.rb.j2 b/library/roles/redmine/templates/unicorn.conf.rb.j2 similarity index 100% rename from redmine/templates/unicorn.conf.rb.j2 rename to library/roles/redmine/templates/unicorn.conf.rb.j2 diff --git a/revive-adserver/defaults/main.yml b/library/roles/revive-adserver/defaults/main.yml similarity index 100% rename from revive-adserver/defaults/main.yml rename to library/roles/revive-adserver/defaults/main.yml diff --git a/revive-adserver/tasks/main.yml b/library/roles/revive-adserver/tasks/main.yml similarity index 100% rename from revive-adserver/tasks/main.yml rename to library/roles/revive-adserver/tasks/main.yml diff --git a/revive-adserver/templates/revive_maintenance_cron.j2 b/library/roles/revive-adserver/templates/revive_maintenance_cron.j2 similarity index 100% rename from revive-adserver/templates/revive_maintenance_cron.j2 rename to library/roles/revive-adserver/templates/revive_maintenance_cron.j2 diff --git a/rstudio-server/defaults/main.yml b/library/roles/rstudio-server/defaults/main.yml similarity index 100% rename from rstudio-server/defaults/main.yml rename to library/roles/rstudio-server/defaults/main.yml diff --git a/rstudio-server/files/kill-rogue-jobs b/library/roles/rstudio-server/files/kill-rogue-jobs similarity index 100% rename from rstudio-server/files/kill-rogue-jobs rename to library/roles/rstudio-server/files/kill-rogue-jobs diff --git a/rstudio-server/files/tomcat_checkandstart b/library/roles/rstudio-server/files/tomcat_checkandstart similarity index 100% rename from rstudio-server/files/tomcat_checkandstart rename to library/roles/rstudio-server/files/tomcat_checkandstart diff --git a/rstudio-server/tasks/main.yml b/library/roles/rstudio-server/tasks/main.yml similarity index 100% rename from rstudio-server/tasks/main.yml rename to library/roles/rstudio-server/tasks/main.yml diff --git a/rsyslog-logstash/defaults/main.yml b/library/roles/rsyslog-logstash/defaults/main.yml similarity index 100% rename from rsyslog-logstash/defaults/main.yml rename to library/roles/rsyslog-logstash/defaults/main.yml diff --git a/rsyslog-logstash/handlers/main.yml b/library/roles/rsyslog-logstash/handlers/main.yml similarity index 100% rename from rsyslog-logstash/handlers/main.yml rename to library/roles/rsyslog-logstash/handlers/main.yml diff --git a/rsyslog-logstash/tasks/main.yml b/library/roles/rsyslog-logstash/tasks/main.yml similarity index 100% rename from rsyslog-logstash/tasks/main.yml rename to library/roles/rsyslog-logstash/tasks/main.yml diff --git a/rsyslog-logstash/templates/old-rsyslog-logstash.conf.j2 b/library/roles/rsyslog-logstash/templates/old-rsyslog-logstash.conf.j2 similarity index 100% rename from rsyslog-logstash/templates/old-rsyslog-logstash.conf.j2 rename to library/roles/rsyslog-logstash/templates/old-rsyslog-logstash.conf.j2 diff --git a/rsyslog-logstash/templates/rsyslog-logstash.conf.j2 b/library/roles/rsyslog-logstash/templates/rsyslog-logstash.conf.j2 similarity index 100% rename from rsyslog-logstash/templates/rsyslog-logstash.conf.j2 rename to library/roles/rsyslog-logstash/templates/rsyslog-logstash.conf.j2 diff --git a/scala-sbt/defaults/main.yml b/library/roles/scala-sbt/defaults/main.yml similarity index 100% rename from scala-sbt/defaults/main.yml rename to library/roles/scala-sbt/defaults/main.yml diff --git a/scala-sbt/meta/main.yml b/library/roles/scala-sbt/meta/main.yml similarity index 100% rename from scala-sbt/meta/main.yml rename to library/roles/scala-sbt/meta/main.yml diff --git a/scala-sbt/tasks/main.yml b/library/roles/scala-sbt/tasks/main.yml similarity index 100% rename from scala-sbt/tasks/main.yml rename to library/roles/scala-sbt/tasks/main.yml diff --git a/sharelatex/defaults/main.yml b/library/roles/sharelatex/defaults/main.yml similarity index 100% rename from sharelatex/defaults/main.yml rename to library/roles/sharelatex/defaults/main.yml diff --git a/sharelatex/tasks/main.yml b/library/roles/sharelatex/tasks/main.yml similarity index 100% rename from sharelatex/tasks/main.yml rename to library/roles/sharelatex/tasks/main.yml diff --git a/sharelatex/templates/sharelatex-env.sh.j2 b/library/roles/sharelatex/templates/sharelatex-env.sh.j2 similarity index 100% rename from sharelatex/templates/sharelatex-env.sh.j2 rename to library/roles/sharelatex/templates/sharelatex-env.sh.j2 diff --git a/shibboleth-sp-2/defaults/main.yml b/library/roles/shibboleth-sp-2/defaults/main.yml similarity index 100% rename from shibboleth-sp-2/defaults/main.yml rename to library/roles/shibboleth-sp-2/defaults/main.yml diff --git a/shibboleth-sp-2/handlers/main.yml b/library/roles/shibboleth-sp-2/handlers/main.yml similarity index 100% rename from shibboleth-sp-2/handlers/main.yml rename to library/roles/shibboleth-sp-2/handlers/main.yml diff --git a/shibboleth-sp-2/meta/main.yml b/library/roles/shibboleth-sp-2/meta/main.yml similarity index 100% rename from shibboleth-sp-2/meta/main.yml rename to library/roles/shibboleth-sp-2/meta/main.yml diff --git a/shibboleth-sp-2/tasks/main.yml b/library/roles/shibboleth-sp-2/tasks/main.yml similarity index 100% rename from shibboleth-sp-2/tasks/main.yml rename to library/roles/shibboleth-sp-2/tasks/main.yml diff --git a/shibboleth-sp-2/vars/main.yml b/library/roles/shibboleth-sp-2/vars/main.yml similarity index 100% rename from shibboleth-sp-2/vars/main.yml rename to library/roles/shibboleth-sp-2/vars/main.yml diff --git a/shinyproxy/defaults/main.yml b/library/roles/shinyproxy/defaults/main.yml similarity index 100% rename from shinyproxy/defaults/main.yml rename to library/roles/shinyproxy/defaults/main.yml diff --git a/shinyproxy/handlers/main.yml b/library/roles/shinyproxy/handlers/main.yml similarity index 100% rename from shinyproxy/handlers/main.yml rename to library/roles/shinyproxy/handlers/main.yml diff --git a/shinyproxy/tasks/main.yml b/library/roles/shinyproxy/tasks/main.yml similarity index 100% rename from shinyproxy/tasks/main.yml rename to library/roles/shinyproxy/tasks/main.yml diff --git a/shinyproxy/templates/shinyproxy-conf.yml.j2 b/library/roles/shinyproxy/templates/shinyproxy-conf.yml.j2 similarity index 100% rename from shinyproxy/templates/shinyproxy-conf.yml.j2 rename to library/roles/shinyproxy/templates/shinyproxy-conf.yml.j2 diff --git a/shinyproxy/templates/shinyproxy-logrotate.j2 b/library/roles/shinyproxy/templates/shinyproxy-logrotate.j2 similarity index 100% rename from shinyproxy/templates/shinyproxy-logrotate.j2 rename to library/roles/shinyproxy/templates/shinyproxy-logrotate.j2 diff --git a/shinyproxy/templates/upstart-shinyproxy.conf.j2 b/library/roles/shinyproxy/templates/upstart-shinyproxy.conf.j2 similarity index 100% rename from shinyproxy/templates/upstart-shinyproxy.conf.j2 rename to library/roles/shinyproxy/templates/upstart-shinyproxy.conf.j2 diff --git a/smaph/defaults/main.yml b/library/roles/smaph/defaults/main.yml similarity index 100% rename from smaph/defaults/main.yml rename to library/roles/smaph/defaults/main.yml diff --git a/smaph/tasks/main.yml b/library/roles/smaph/tasks/main.yml similarity index 100% rename from smaph/tasks/main.yml rename to library/roles/smaph/tasks/main.yml diff --git a/smaph/templates/catalina-smaph.xml.j2 b/library/roles/smaph/templates/catalina-smaph.xml.j2 similarity index 100% rename from smaph/templates/catalina-smaph.xml.j2 rename to library/roles/smaph/templates/catalina-smaph.xml.j2 diff --git a/solr-tomcat-core-conf/defaults/main.yml b/library/roles/solr-tomcat-core-conf/defaults/main.yml similarity index 100% rename from solr-tomcat-core-conf/defaults/main.yml rename to library/roles/solr-tomcat-core-conf/defaults/main.yml diff --git a/solr-tomcat-core-conf/files/solr_core_base.tar.gz b/library/roles/solr-tomcat-core-conf/files/solr_core_base.tar.gz similarity index 100% rename from solr-tomcat-core-conf/files/solr_core_base.tar.gz rename to library/roles/solr-tomcat-core-conf/files/solr_core_base.tar.gz diff --git a/solr-tomcat-core-conf/handlers/main.yml b/library/roles/solr-tomcat-core-conf/handlers/main.yml similarity index 100% rename from solr-tomcat-core-conf/handlers/main.yml rename to library/roles/solr-tomcat-core-conf/handlers/main.yml diff --git a/solr-tomcat-core-conf/tasks/main.yml b/library/roles/solr-tomcat-core-conf/tasks/main.yml similarity index 100% rename from solr-tomcat-core-conf/tasks/main.yml rename to library/roles/solr-tomcat-core-conf/tasks/main.yml diff --git a/solr-tomcat-core-conf/templates/solr.xml.j2 b/library/roles/solr-tomcat-core-conf/templates/solr.xml.j2 similarity index 100% rename from solr-tomcat-core-conf/templates/solr.xml.j2 rename to library/roles/solr-tomcat-core-conf/templates/solr.xml.j2 diff --git a/solr-tomcat-core-conf/vars/main.yml b/library/roles/solr-tomcat-core-conf/vars/main.yml similarity index 100% rename from solr-tomcat-core-conf/vars/main.yml rename to library/roles/solr-tomcat-core-conf/vars/main.yml diff --git a/solr-tomcat-instance/defaults/main.yml b/library/roles/solr-tomcat-instance/defaults/main.yml similarity index 100% rename from solr-tomcat-instance/defaults/main.yml rename to library/roles/solr-tomcat-instance/defaults/main.yml diff --git a/solr-tomcat-instance/files/collection1.tar.gz b/library/roles/solr-tomcat-instance/files/collection1.tar.gz similarity index 100% rename from solr-tomcat-instance/files/collection1.tar.gz rename to library/roles/solr-tomcat-instance/files/collection1.tar.gz diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/README.txt b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/README.txt diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/icu4j-53.1.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/icu4j-53.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lib/icu4j-53.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/icu4j-53.1.jar diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-fsa-1.7.1.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-fsa-1.7.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-fsa-1.7.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-fsa-1.7.1.jar diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.10.2.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.10.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.10.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.10.2.jar diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.10.2.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.10.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.10.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.10.2.jar diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-4.10.2.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-4.10.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-4.10.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-4.10.2.jar diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-4.10.2.jar b/library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-4.10.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-4.10.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-4.10.2.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/README.txt b/library/roles/solr-tomcat-instance/files/contrib/clustering/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/clustering/README.txt diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/attributes-binder-1.2.1.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/attributes-binder-1.2.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/attributes-binder-1.2.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/attributes-binder-1.2.1.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/carrot2-mini-3.9.0.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/carrot2-mini-3.9.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/carrot2-mini-3.9.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/carrot2-mini-3.9.0.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/hppc-0.5.2.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/hppc-0.5.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/hppc-0.5.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/hppc-0.5.2.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/jackson-core-asl-1.9.13.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/jackson-core-asl-1.9.13.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/jackson-core-asl-1.9.13.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/jackson-core-asl-1.9.13.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/jackson-mapper-asl-1.9.13.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/jackson-mapper-asl-1.9.13.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/jackson-mapper-asl-1.9.13.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/jackson-mapper-asl-1.9.13.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/mahout-collections-1.0.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/mahout-collections-1.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/mahout-collections-1.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/mahout-collections-1.0.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/mahout-math-0.6.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/mahout-math-0.6.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/mahout-math-0.6.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/mahout-math-0.6.jar diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/simple-xml-2.7.jar b/library/roles/solr-tomcat-instance/files/contrib/clustering/lib/simple-xml-2.7.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/clustering/lib/simple-xml-2.7.jar rename to library/roles/solr-tomcat-instance/files/contrib/clustering/lib/simple-xml-2.7.jar diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar b/library/roles/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar b/library/roles/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar b/library/roles/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler/README.txt b/library/roles/solr-tomcat-instance/files/contrib/dataimporthandler/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/dataimporthandler/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/dataimporthandler/README.txt diff --git a/solr-tomcat-instance/files/contrib/extraction/README.txt b/library/roles/solr-tomcat-instance/files/contrib/extraction/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/extraction/README.txt diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/aspectjrt-1.6.11.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/aspectjrt-1.6.11.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/aspectjrt-1.6.11.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/aspectjrt-1.6.11.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/bcmail-jdk15-1.45.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/bcmail-jdk15-1.45.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/bcmail-jdk15-1.45.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/bcmail-jdk15-1.45.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/bcprov-jdk15-1.45.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/bcprov-jdk15-1.45.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/bcprov-jdk15-1.45.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/bcprov-jdk15-1.45.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/boilerpipe-1.1.0.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/boilerpipe-1.1.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/boilerpipe-1.1.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/boilerpipe-1.1.0.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/commons-compress-1.7.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/commons-compress-1.7.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/commons-compress-1.7.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/commons-compress-1.7.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/dom4j-1.6.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/dom4j-1.6.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/dom4j-1.6.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/dom4j-1.6.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/fontbox-1.8.4.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/fontbox-1.8.4.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/fontbox-1.8.4.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/fontbox-1.8.4.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/icu4j-53.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/icu4j-53.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/icu4j-53.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/icu4j-53.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/isoparser-1.0-RC-1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/isoparser-1.0-RC-1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/isoparser-1.0-RC-1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/isoparser-1.0-RC-1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/jdom-1.0.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/jdom-1.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/jdom-1.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/jdom-1.0.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/jempbox-1.8.4.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/jempbox-1.8.4.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/jempbox-1.8.4.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/jempbox-1.8.4.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/jhighlight-1.0.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/jhighlight-1.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/jhighlight-1.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/jhighlight-1.0.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/juniversalchardet-1.0.3.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/juniversalchardet-1.0.3.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/juniversalchardet-1.0.3.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/juniversalchardet-1.0.3.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/metadata-extractor-2.6.2.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/metadata-extractor-2.6.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/metadata-extractor-2.6.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/metadata-extractor-2.6.2.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/pdfbox-1.8.4.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/pdfbox-1.8.4.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/pdfbox-1.8.4.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/pdfbox-1.8.4.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-3.10.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-3.10.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/poi-3.10.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-3.10.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-3.10.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-3.10.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-3.10.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-3.10.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-schemas-3.10.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-schemas-3.10.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-schemas-3.10.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-schemas-3.10.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-scratchpad-3.10.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-scratchpad-3.10.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/poi-scratchpad-3.10.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/poi-scratchpad-3.10.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/rome-0.9.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/rome-0.9.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/rome-0.9.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/rome-0.9.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tagsoup-1.2.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tagsoup-1.2.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/tagsoup-1.2.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tagsoup-1.2.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tika-core-1.5.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tika-core-1.5.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/tika-core-1.5.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tika-core-1.5.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tika-parsers-1.5.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tika-parsers-1.5.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/tika-parsers-1.5.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tika-parsers-1.5.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tika-xmp-1.5.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tika-xmp-1.5.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/tika-xmp-1.5.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/tika-xmp-1.5.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-core-0.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-core-0.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-core-0.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-core-0.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-tika-0.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-tika-0.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-tika-0.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-tika-0.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xercesImpl-2.9.1.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xercesImpl-2.9.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/xercesImpl-2.9.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xercesImpl-2.9.1.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xmlbeans-2.6.0.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xmlbeans-2.6.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/xmlbeans-2.6.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xmlbeans-2.6.0.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xmpcore-5.1.2.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xmpcore-5.1.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/xmpcore-5.1.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xmpcore-5.1.2.jar diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xz-1.4.jar b/library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xz-1.4.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/extraction/lib/xz-1.4.jar rename to library/roles/solr-tomcat-instance/files/contrib/extraction/lib/xz-1.4.jar diff --git a/solr-tomcat-instance/files/contrib/langid/README.txt b/library/roles/solr-tomcat-instance/files/contrib/langid/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/langid/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/langid/README.txt diff --git a/solr-tomcat-instance/files/contrib/langid/lib/jsonic-1.2.7.jar b/library/roles/solr-tomcat-instance/files/contrib/langid/lib/jsonic-1.2.7.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/langid/lib/jsonic-1.2.7.jar rename to library/roles/solr-tomcat-instance/files/contrib/langid/lib/jsonic-1.2.7.jar diff --git a/solr-tomcat-instance/files/contrib/langid/lib/langdetect-1.1-20120112.jar b/library/roles/solr-tomcat-instance/files/contrib/langid/lib/langdetect-1.1-20120112.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/langid/lib/langdetect-1.1-20120112.jar rename to library/roles/solr-tomcat-instance/files/contrib/langid/lib/langdetect-1.1-20120112.jar diff --git a/solr-tomcat-instance/files/contrib/map-reduce/README.txt b/library/roles/solr-tomcat-instance/files/contrib/map-reduce/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/map-reduce/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/map-reduce/README.txt diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/Saxon-HE-9.5.1-4.jar b/library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/Saxon-HE-9.5.1-4.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/map-reduce/lib/Saxon-HE-9.5.1-4.jar rename to library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/Saxon-HE-9.5.1-4.jar diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/argparse4j-0.4.3.jar b/library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/argparse4j-0.4.3.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/map-reduce/lib/argparse4j-0.4.3.jar rename to library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/argparse4j-0.4.3.jar diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/hadoop-mapreduce-client-core-2.2.0.jar b/library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/hadoop-mapreduce-client-core-2.2.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/map-reduce/lib/hadoop-mapreduce-client-core-2.2.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/hadoop-mapreduce-client-core-2.2.0.jar diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/kite-morphlines-saxon-0.12.1.jar b/library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/kite-morphlines-saxon-0.12.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/map-reduce/lib/kite-morphlines-saxon-0.12.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/map-reduce/lib/kite-morphlines-saxon-0.12.1.jar diff --git a/solr-tomcat-instance/files/contrib/map-reduce/src/test-files/README.txt b/library/roles/solr-tomcat-instance/files/contrib/map-reduce/src/test-files/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/map-reduce/src/test-files/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/map-reduce/src/test-files/README.txt diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/README.txt b/library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-cell/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/README.txt diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-json-0.12.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-json-0.12.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-json-0.12.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-json-0.12.1.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-core-0.12.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-core-0.12.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-core-0.12.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-core-0.12.1.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-decompress-0.12.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-decompress-0.12.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-decompress-0.12.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-decompress-0.12.1.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-twitter-0.12.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-twitter-0.12.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-twitter-0.12.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-twitter-0.12.1.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/src/test-files/README.txt b/library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/src/test-files/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-cell/src/test-files/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-cell/src/test-files/README.txt diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/README.txt b/library/roles/solr-tomcat-instance/files/contrib/morphlines-core/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-core/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-core/README.txt diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/config-1.0.2.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/config-1.0.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-core/lib/config-1.0.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/config-1.0.2.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-avro-0.12.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-avro-0.12.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-avro-0.12.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-avro-0.12.1.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-core-0.12.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-core-0.12.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-core-0.12.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-core-0.12.1.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-core-3.0.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-core-3.0.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-core-3.0.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-core-3.0.1.jar diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar b/library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar diff --git a/solr-tomcat-instance/files/contrib/uima/README.txt b/library/roles/solr-tomcat-instance/files/contrib/uima/README.txt similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/README.txt rename to library/roles/solr-tomcat-instance/files/contrib/uima/README.txt diff --git a/solr-tomcat-instance/files/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar b/library/roles/solr-tomcat-instance/files/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar diff --git a/solr-tomcat-instance/files/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar b/library/roles/solr-tomcat-instance/files/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar diff --git a/solr-tomcat-instance/files/contrib/uima/lib/Tagger-2.3.1.jar b/library/roles/solr-tomcat-instance/files/contrib/uima/lib/Tagger-2.3.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/lib/Tagger-2.3.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/uima/lib/Tagger-2.3.1.jar diff --git a/solr-tomcat-instance/files/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar b/library/roles/solr-tomcat-instance/files/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar diff --git a/solr-tomcat-instance/files/contrib/uima/lib/commons-digester-2.1.jar b/library/roles/solr-tomcat-instance/files/contrib/uima/lib/commons-digester-2.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/lib/commons-digester-2.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/uima/lib/commons-digester-2.1.jar diff --git a/solr-tomcat-instance/files/contrib/uima/lib/uimaj-core-2.3.1.jar b/library/roles/solr-tomcat-instance/files/contrib/uima/lib/uimaj-core-2.3.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/lib/uimaj-core-2.3.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/uima/lib/uimaj-core-2.3.1.jar diff --git a/solr-tomcat-instance/files/contrib/uima/lucene-libs/lucene-analyzers-uima-4.10.2.jar b/library/roles/solr-tomcat-instance/files/contrib/uima/lucene-libs/lucene-analyzers-uima-4.10.2.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/uima/lucene-libs/lucene-analyzers-uima-4.10.2.jar rename to library/roles/solr-tomcat-instance/files/contrib/uima/lucene-libs/lucene-analyzers-uima-4.10.2.jar diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/commons-beanutils-1.8.3.jar b/library/roles/solr-tomcat-instance/files/contrib/velocity/lib/commons-beanutils-1.8.3.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/velocity/lib/commons-beanutils-1.8.3.jar rename to library/roles/solr-tomcat-instance/files/contrib/velocity/lib/commons-beanutils-1.8.3.jar diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/commons-collections-3.2.1.jar b/library/roles/solr-tomcat-instance/files/contrib/velocity/lib/commons-collections-3.2.1.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/velocity/lib/commons-collections-3.2.1.jar rename to library/roles/solr-tomcat-instance/files/contrib/velocity/lib/commons-collections-3.2.1.jar diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/velocity-1.7.jar b/library/roles/solr-tomcat-instance/files/contrib/velocity/lib/velocity-1.7.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/velocity/lib/velocity-1.7.jar rename to library/roles/solr-tomcat-instance/files/contrib/velocity/lib/velocity-1.7.jar diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/velocity-tools-2.0.jar b/library/roles/solr-tomcat-instance/files/contrib/velocity/lib/velocity-tools-2.0.jar similarity index 100% rename from solr-tomcat-instance/files/contrib/velocity/lib/velocity-tools-2.0.jar rename to library/roles/solr-tomcat-instance/files/contrib/velocity/lib/velocity-tools-2.0.jar diff --git a/solr-tomcat-instance/files/solr-4.10.2.war b/library/roles/solr-tomcat-instance/files/solr-4.10.2.war similarity index 100% rename from solr-tomcat-instance/files/solr-4.10.2.war rename to library/roles/solr-tomcat-instance/files/solr-4.10.2.war diff --git a/solr-tomcat-instance/files/solr_core_base.tar.gz b/library/roles/solr-tomcat-instance/files/solr_core_base.tar.gz similarity index 100% rename from solr-tomcat-instance/files/solr_core_base.tar.gz rename to library/roles/solr-tomcat-instance/files/solr_core_base.tar.gz diff --git a/solr-tomcat-instance/handlers/main.yml b/library/roles/solr-tomcat-instance/handlers/main.yml similarity index 100% rename from solr-tomcat-instance/handlers/main.yml rename to library/roles/solr-tomcat-instance/handlers/main.yml diff --git a/solr-tomcat-instance/tasks/main.yml b/library/roles/solr-tomcat-instance/tasks/main.yml similarity index 100% rename from solr-tomcat-instance/tasks/main.yml rename to library/roles/solr-tomcat-instance/tasks/main.yml diff --git a/solr-tomcat-instance/templates/catalina-solr.xml.j2 b/library/roles/solr-tomcat-instance/templates/catalina-solr.xml.j2 similarity index 100% rename from solr-tomcat-instance/templates/catalina-solr.xml.j2 rename to library/roles/solr-tomcat-instance/templates/catalina-solr.xml.j2 diff --git a/solr-tomcat-instance/templates/solr.xml.j2 b/library/roles/solr-tomcat-instance/templates/solr.xml.j2 similarity index 100% rename from solr-tomcat-instance/templates/solr.xml.j2 rename to library/roles/solr-tomcat-instance/templates/solr.xml.j2 diff --git a/solr-tomcat-instance/templates/tomcat.local.j2 b/library/roles/solr-tomcat-instance/templates/tomcat.local.j2 similarity index 100% rename from solr-tomcat-instance/templates/tomcat.local.j2 rename to library/roles/solr-tomcat-instance/templates/tomcat.local.j2 diff --git a/solr-tomcat-instance/templates/zoo.cfg.j2 b/library/roles/solr-tomcat-instance/templates/zoo.cfg.j2 similarity index 100% rename from solr-tomcat-instance/templates/zoo.cfg.j2 rename to library/roles/solr-tomcat-instance/templates/zoo.cfg.j2 diff --git a/solr/defaults/main.yml b/library/roles/solr/defaults/main.yml similarity index 100% rename from solr/defaults/main.yml rename to library/roles/solr/defaults/main.yml diff --git a/solr/handlers/main.yml b/library/roles/solr/handlers/main.yml similarity index 100% rename from solr/handlers/main.yml rename to library/roles/solr/handlers/main.yml diff --git a/solr/meta/main.yml b/library/roles/solr/meta/main.yml similarity index 100% rename from solr/meta/main.yml rename to library/roles/solr/meta/main.yml diff --git a/solr/tasks/main.yml b/library/roles/solr/tasks/main.yml similarity index 100% rename from solr/tasks/main.yml rename to library/roles/solr/tasks/main.yml diff --git a/solr/templates/solr b/library/roles/solr/templates/solr similarity index 100% rename from solr/templates/solr rename to library/roles/solr/templates/solr diff --git a/solr/templates/solr-default.j2 b/library/roles/solr/templates/solr-default.j2 similarity index 100% rename from solr/templates/solr-default.j2 rename to library/roles/solr/templates/solr-default.j2 diff --git a/solr/templates/solr-exporter-config.xml b/library/roles/solr/templates/solr-exporter-config.xml similarity index 100% rename from solr/templates/solr-exporter-config.xml rename to library/roles/solr/templates/solr-exporter-config.xml diff --git a/solr/templates/solr.xml.j2 b/library/roles/solr/templates/solr.xml.j2 similarity index 100% rename from solr/templates/solr.xml.j2 rename to library/roles/solr/templates/solr.xml.j2 diff --git a/solr/templates/solr_prometheus_exporter.systemd.j2 b/library/roles/solr/templates/solr_prometheus_exporter.systemd.j2 similarity index 100% rename from solr/templates/solr_prometheus_exporter.systemd.j2 rename to library/roles/solr/templates/solr_prometheus_exporter.systemd.j2 diff --git a/solr/templates/solr_prometheus_exporter.upstart.j2 b/library/roles/solr/templates/solr_prometheus_exporter.upstart.j2 similarity index 100% rename from solr/templates/solr_prometheus_exporter.upstart.j2 rename to library/roles/solr/templates/solr_prometheus_exporter.upstart.j2 diff --git a/solr/templates/zoo.cfg.j2 b/library/roles/solr/templates/zoo.cfg.j2 similarity index 100% rename from solr/templates/zoo.cfg.j2 rename to library/roles/solr/templates/zoo.cfg.j2 diff --git a/springboot-config/defaults/main.yml b/library/roles/springboot-config/defaults/main.yml similarity index 100% rename from springboot-config/defaults/main.yml rename to library/roles/springboot-config/defaults/main.yml diff --git a/springboot-config/tasks/main.yml b/library/roles/springboot-config/tasks/main.yml similarity index 100% rename from springboot-config/tasks/main.yml rename to library/roles/springboot-config/tasks/main.yml diff --git a/springboot-config/templates/springboot-logrotate.j2 b/library/roles/springboot-config/templates/springboot-logrotate.j2 similarity index 100% rename from springboot-config/templates/springboot-logrotate.j2 rename to library/roles/springboot-config/templates/springboot-logrotate.j2 diff --git a/springboot-config/templates/springboot-upstart.conf.j2 b/library/roles/springboot-config/templates/springboot-upstart.conf.j2 similarity index 100% rename from springboot-config/templates/springboot-upstart.conf.j2 rename to library/roles/springboot-config/templates/springboot-upstart.conf.j2 diff --git a/ssh-keys/defaults/main.yml b/library/roles/ssh-keys/defaults/main.yml similarity index 100% rename from ssh-keys/defaults/main.yml rename to library/roles/ssh-keys/defaults/main.yml diff --git a/ssh-keys/tasks/main.yml b/library/roles/ssh-keys/tasks/main.yml similarity index 100% rename from ssh-keys/tasks/main.yml rename to library/roles/ssh-keys/tasks/main.yml diff --git a/ssh-keys/tasks/non-root-ssh-keys.yml b/library/roles/ssh-keys/tasks/non-root-ssh-keys.yml similarity index 100% rename from ssh-keys/tasks/non-root-ssh-keys.yml rename to library/roles/ssh-keys/tasks/non-root-ssh-keys.yml diff --git a/ssh-keys/tasks/root-ssh-keys.yml b/library/roles/ssh-keys/tasks/root-ssh-keys.yml similarity index 100% rename from ssh-keys/tasks/root-ssh-keys.yml rename to library/roles/ssh-keys/tasks/root-ssh-keys.yml diff --git a/sshd_config/defaults/main.yml b/library/roles/sshd_config/defaults/main.yml similarity index 100% rename from sshd_config/defaults/main.yml rename to library/roles/sshd_config/defaults/main.yml diff --git a/sshd_config/handlers/main.yml b/library/roles/sshd_config/handlers/main.yml similarity index 100% rename from sshd_config/handlers/main.yml rename to library/roles/sshd_config/handlers/main.yml diff --git a/sshd_config/tasks/main.yml b/library/roles/sshd_config/tasks/main.yml similarity index 100% rename from sshd_config/tasks/main.yml rename to library/roles/sshd_config/tasks/main.yml diff --git a/sshd_config/templates/sshd_config.j2 b/library/roles/sshd_config/templates/sshd_config.j2 similarity index 100% rename from sshd_config/templates/sshd_config.j2 rename to library/roles/sshd_config/templates/sshd_config.j2 diff --git a/stanford-corenlp/defaults/main.yml b/library/roles/stanford-corenlp/defaults/main.yml similarity index 100% rename from stanford-corenlp/defaults/main.yml rename to library/roles/stanford-corenlp/defaults/main.yml diff --git a/stanford-corenlp/tasks/main.yml b/library/roles/stanford-corenlp/tasks/main.yml similarity index 100% rename from stanford-corenlp/tasks/main.yml rename to library/roles/stanford-corenlp/tasks/main.yml diff --git a/stanford-corenlp/templates/stanford-corenlp.upstart.j2 b/library/roles/stanford-corenlp/templates/stanford-corenlp.upstart.j2 similarity index 100% rename from stanford-corenlp/templates/stanford-corenlp.upstart.j2 rename to library/roles/stanford-corenlp/templates/stanford-corenlp.upstart.j2 diff --git a/stanford-corenlp/templates/tint.upstart.j2 b/library/roles/stanford-corenlp/templates/tint.upstart.j2 similarity index 100% rename from stanford-corenlp/templates/tint.upstart.j2 rename to library/roles/stanford-corenlp/templates/tint.upstart.j2 diff --git a/textpro-ita/defaults/main.yml b/library/roles/textpro-ita/defaults/main.yml similarity index 100% rename from textpro-ita/defaults/main.yml rename to library/roles/textpro-ita/defaults/main.yml diff --git a/textpro-ita/meta/main.yml b/library/roles/textpro-ita/meta/main.yml similarity index 100% rename from textpro-ita/meta/main.yml rename to library/roles/textpro-ita/meta/main.yml diff --git a/textpro-ita/tasks/main.yml b/library/roles/textpro-ita/tasks/main.yml similarity index 100% rename from textpro-ita/tasks/main.yml rename to library/roles/textpro-ita/tasks/main.yml diff --git a/thredds/defaults/main.yml b/library/roles/thredds/defaults/main.yml similarity index 100% rename from thredds/defaults/main.yml rename to library/roles/thredds/defaults/main.yml diff --git a/thredds/files/customPalettes.tar.gz b/library/roles/thredds/files/customPalettes.tar.gz similarity index 100% rename from thredds/files/customPalettes.tar.gz rename to library/roles/thredds/files/customPalettes.tar.gz diff --git a/thredds/tasks/main.yml b/library/roles/thredds/tasks/main.yml similarity index 100% rename from thredds/tasks/main.yml rename to library/roles/thredds/tasks/main.yml diff --git a/thredds/templates/catalog.xml.j2 b/library/roles/thredds/templates/catalog.xml.j2 similarity index 100% rename from thredds/templates/catalog.xml.j2 rename to library/roles/thredds/templates/catalog.xml.j2 diff --git a/thredds/templates/log4j2.xml.j2 b/library/roles/thredds/templates/log4j2.xml.j2 similarity index 100% rename from thredds/templates/log4j2.xml.j2 rename to library/roles/thredds/templates/log4j2.xml.j2 diff --git a/thredds/templates/threddsConfig.xml.j2 b/library/roles/thredds/templates/threddsConfig.xml.j2 similarity index 100% rename from thredds/templates/threddsConfig.xml.j2 rename to library/roles/thredds/templates/threddsConfig.xml.j2 diff --git a/thredds/templates/web.xml.j2 b/library/roles/thredds/templates/web.xml.j2 similarity index 100% rename from thredds/templates/web.xml.j2 rename to library/roles/thredds/templates/web.xml.j2 diff --git a/thredds/templates/wmsConfig.xml.j2 b/library/roles/thredds/templates/wmsConfig.xml.j2 similarity index 100% rename from thredds/templates/wmsConfig.xml.j2 rename to library/roles/thredds/templates/wmsConfig.xml.j2 diff --git a/tick/chronograf/defaults/main.yml b/library/roles/tick/chronograf/defaults/main.yml similarity index 100% rename from tick/chronograf/defaults/main.yml rename to library/roles/tick/chronograf/defaults/main.yml diff --git a/tick/chronograf/tasks/main.yml b/library/roles/tick/chronograf/tasks/main.yml similarity index 100% rename from tick/chronograf/tasks/main.yml rename to library/roles/tick/chronograf/tasks/main.yml diff --git a/tick/influxdb/defaults/main.yml b/library/roles/tick/influxdb/defaults/main.yml similarity index 100% rename from tick/influxdb/defaults/main.yml rename to library/roles/tick/influxdb/defaults/main.yml diff --git a/tick/influxdb/tasks/main.yml b/library/roles/tick/influxdb/tasks/main.yml similarity index 100% rename from tick/influxdb/tasks/main.yml rename to library/roles/tick/influxdb/tasks/main.yml diff --git a/tick/telegraf/defaults/main.yml b/library/roles/tick/telegraf/defaults/main.yml similarity index 100% rename from tick/telegraf/defaults/main.yml rename to library/roles/tick/telegraf/defaults/main.yml diff --git a/tick/telegraf/tasks/main.yml b/library/roles/tick/telegraf/tasks/main.yml similarity index 100% rename from tick/telegraf/tasks/main.yml rename to library/roles/tick/telegraf/tasks/main.yml diff --git a/timezone/defaults/main.yml b/library/roles/timezone/defaults/main.yml similarity index 100% rename from timezone/defaults/main.yml rename to library/roles/timezone/defaults/main.yml diff --git a/timezone/tasks/main.yml b/library/roles/timezone/tasks/main.yml similarity index 100% rename from timezone/tasks/main.yml rename to library/roles/timezone/tasks/main.yml diff --git a/timezone/templates/etc-timezone.j2 b/library/roles/timezone/templates/etc-timezone.j2 similarity index 100% rename from timezone/templates/etc-timezone.j2 rename to library/roles/timezone/templates/etc-timezone.j2 diff --git a/tomcat-apache-requirements/files/xercesImpl.jar b/library/roles/tomcat-apache-requirements/files/xercesImpl.jar similarity index 100% rename from tomcat-apache-requirements/files/xercesImpl.jar rename to library/roles/tomcat-apache-requirements/files/xercesImpl.jar diff --git a/tomcat-apache-requirements/meta/main.yml b/library/roles/tomcat-apache-requirements/meta/main.yml similarity index 100% rename from tomcat-apache-requirements/meta/main.yml rename to library/roles/tomcat-apache-requirements/meta/main.yml diff --git a/tomcat-apache-requirements/tasks/java-requirements.yml b/library/roles/tomcat-apache-requirements/tasks/java-requirements.yml similarity index 100% rename from tomcat-apache-requirements/tasks/java-requirements.yml rename to library/roles/tomcat-apache-requirements/tasks/java-requirements.yml diff --git a/tomcat-apache-requirements/tasks/main.yml b/library/roles/tomcat-apache-requirements/tasks/main.yml similarity index 100% rename from tomcat-apache-requirements/tasks/main.yml rename to library/roles/tomcat-apache-requirements/tasks/main.yml diff --git a/tomcat-apache-requirements/tasks/packages.yml b/library/roles/tomcat-apache-requirements/tasks/packages.yml similarity index 100% rename from tomcat-apache-requirements/tasks/packages.yml rename to library/roles/tomcat-apache-requirements/tasks/packages.yml diff --git a/tomcat-multiple-instances/defaults/main.yml b/library/roles/tomcat-multiple-instances/defaults/main.yml similarity index 100% rename from tomcat-multiple-instances/defaults/main.yml rename to library/roles/tomcat-multiple-instances/defaults/main.yml diff --git a/tomcat-multiple-instances/files/context.xml b/library/roles/tomcat-multiple-instances/files/context.xml similarity index 100% rename from tomcat-multiple-instances/files/context.xml rename to library/roles/tomcat-multiple-instances/files/context.xml diff --git a/tomcat-multiple-instances/files/jmxremote.access b/library/roles/tomcat-multiple-instances/files/jmxremote.access similarity index 100% rename from tomcat-multiple-instances/files/jmxremote.access rename to library/roles/tomcat-multiple-instances/files/jmxremote.access diff --git a/tomcat-multiple-instances/files/logging.properties b/library/roles/tomcat-multiple-instances/files/logging.properties similarity index 100% rename from tomcat-multiple-instances/files/logging.properties rename to library/roles/tomcat-multiple-instances/files/logging.properties diff --git a/tomcat-multiple-instances/files/policy.d/01system.policy b/library/roles/tomcat-multiple-instances/files/policy.d/01system.policy similarity index 100% rename from tomcat-multiple-instances/files/policy.d/01system.policy rename to library/roles/tomcat-multiple-instances/files/policy.d/01system.policy diff --git a/tomcat-multiple-instances/files/policy.d/02debian.policy b/library/roles/tomcat-multiple-instances/files/policy.d/02debian.policy similarity index 100% rename from tomcat-multiple-instances/files/policy.d/02debian.policy rename to library/roles/tomcat-multiple-instances/files/policy.d/02debian.policy diff --git a/tomcat-multiple-instances/files/policy.d/03catalina.policy b/library/roles/tomcat-multiple-instances/files/policy.d/03catalina.policy similarity index 100% rename from tomcat-multiple-instances/files/policy.d/03catalina.policy rename to library/roles/tomcat-multiple-instances/files/policy.d/03catalina.policy diff --git a/tomcat-multiple-instances/files/policy.d/04webapps.policy b/library/roles/tomcat-multiple-instances/files/policy.d/04webapps.policy similarity index 100% rename from tomcat-multiple-instances/files/policy.d/04webapps.policy rename to library/roles/tomcat-multiple-instances/files/policy.d/04webapps.policy diff --git a/tomcat-multiple-instances/files/policy.d/50local.policy b/library/roles/tomcat-multiple-instances/files/policy.d/50local.policy similarity index 100% rename from tomcat-multiple-instances/files/policy.d/50local.policy rename to library/roles/tomcat-multiple-instances/files/policy.d/50local.policy diff --git a/tomcat-multiple-instances/files/web.xml b/library/roles/tomcat-multiple-instances/files/web.xml similarity index 100% rename from tomcat-multiple-instances/files/web.xml rename to library/roles/tomcat-multiple-instances/files/web.xml diff --git a/tomcat-multiple-instances/handlers/main.yml b/library/roles/tomcat-multiple-instances/handlers/main.yml similarity index 100% rename from tomcat-multiple-instances/handlers/main.yml rename to library/roles/tomcat-multiple-instances/handlers/main.yml diff --git a/tomcat-multiple-instances/meta/main.yml b/library/roles/tomcat-multiple-instances/meta/main.yml similarity index 100% rename from tomcat-multiple-instances/meta/main.yml rename to library/roles/tomcat-multiple-instances/meta/main.yml diff --git a/tomcat-multiple-instances/tasks/main.yml b/library/roles/tomcat-multiple-instances/tasks/main.yml similarity index 100% rename from tomcat-multiple-instances/tasks/main.yml rename to library/roles/tomcat-multiple-instances/tasks/main.yml diff --git a/tomcat-multiple-instances/templates/catalina.properties.j2 b/library/roles/tomcat-multiple-instances/templates/catalina.properties.j2 similarity index 100% rename from tomcat-multiple-instances/templates/catalina.properties.j2 rename to library/roles/tomcat-multiple-instances/templates/catalina.properties.j2 diff --git a/tomcat-multiple-instances/templates/jmxremote.passwd.j2 b/library/roles/tomcat-multiple-instances/templates/jmxremote.passwd.j2 similarity index 100% rename from tomcat-multiple-instances/templates/jmxremote.passwd.j2 rename to library/roles/tomcat-multiple-instances/templates/jmxremote.passwd.j2 diff --git a/tomcat-multiple-instances/templates/tomcat-context.xml.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat-context.xml.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat-context.xml.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat-context.xml.j2 diff --git a/tomcat-multiple-instances/templates/tomcat-default.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat-default.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat-default.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat-default.j2 diff --git a/tomcat-multiple-instances/templates/tomcat-host-manager.xml.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat-host-manager.xml.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat-host-manager.xml.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat-host-manager.xml.j2 diff --git a/tomcat-multiple-instances/templates/tomcat-instance.init.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat-instance.init.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat-instance.init.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat-instance.init.j2 diff --git a/tomcat-multiple-instances/templates/tomcat-manager.xml.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat-manager.xml.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat-manager.xml.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat-manager.xml.j2 diff --git a/tomcat-multiple-instances/templates/tomcat-server.xml.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat-server.xml.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat-server.xml.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat-server.xml.j2 diff --git a/tomcat-multiple-instances/templates/tomcat-users.xml.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat-users.xml.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat-users.xml.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat-users.xml.j2 diff --git a/tomcat-multiple-instances/templates/tomcat.logrotate.j2 b/library/roles/tomcat-multiple-instances/templates/tomcat.logrotate.j2 similarity index 100% rename from tomcat-multiple-instances/templates/tomcat.logrotate.j2 rename to library/roles/tomcat-multiple-instances/templates/tomcat.logrotate.j2 diff --git a/tomcat/defaults/main.yml b/library/roles/tomcat/defaults/main.yml similarity index 100% rename from tomcat/defaults/main.yml rename to library/roles/tomcat/defaults/main.yml diff --git a/tomcat/files/catalina.properties b/library/roles/tomcat/files/catalina.properties similarity index 100% rename from tomcat/files/catalina.properties rename to library/roles/tomcat/files/catalina.properties diff --git a/tomcat/files/jmxremote.access b/library/roles/tomcat/files/jmxremote.access similarity index 100% rename from tomcat/files/jmxremote.access rename to library/roles/tomcat/files/jmxremote.access diff --git a/tomcat/files/logging.properties b/library/roles/tomcat/files/logging.properties similarity index 100% rename from tomcat/files/logging.properties rename to library/roles/tomcat/files/logging.properties diff --git a/tomcat/files/tomcat6-juli-adapters.jar b/library/roles/tomcat/files/tomcat6-juli-adapters.jar similarity index 100% rename from tomcat/files/tomcat6-juli-adapters.jar rename to library/roles/tomcat/files/tomcat6-juli-adapters.jar diff --git a/tomcat/files/tomcat6-juli-log4j.jar b/library/roles/tomcat/files/tomcat6-juli-log4j.jar similarity index 100% rename from tomcat/files/tomcat6-juli-log4j.jar rename to library/roles/tomcat/files/tomcat6-juli-log4j.jar diff --git a/tomcat/files/tomcat7-juli-adapters.jar b/library/roles/tomcat/files/tomcat7-juli-adapters.jar similarity index 100% rename from tomcat/files/tomcat7-juli-adapters.jar rename to library/roles/tomcat/files/tomcat7-juli-adapters.jar diff --git a/tomcat/files/tomcat7-juli-log4j.jar b/library/roles/tomcat/files/tomcat7-juli-log4j.jar similarity index 100% rename from tomcat/files/tomcat7-juli-log4j.jar rename to library/roles/tomcat/files/tomcat7-juli-log4j.jar diff --git a/tomcat/handlers/main.yml b/library/roles/tomcat/handlers/main.yml similarity index 100% rename from tomcat/handlers/main.yml rename to library/roles/tomcat/handlers/main.yml diff --git a/tomcat/meta/main.yml b/library/roles/tomcat/meta/main.yml similarity index 100% rename from tomcat/meta/main.yml rename to library/roles/tomcat/meta/main.yml diff --git a/tomcat/tasks/access_log.yml b/library/roles/tomcat/tasks/access_log.yml similarity index 100% rename from tomcat/tasks/access_log.yml rename to library/roles/tomcat/tasks/access_log.yml diff --git a/tomcat/tasks/main.yml b/library/roles/tomcat/tasks/main.yml similarity index 100% rename from tomcat/tasks/main.yml rename to library/roles/tomcat/tasks/main.yml diff --git a/tomcat/tasks/not_pgsql_jdbc.yml b/library/roles/tomcat/tasks/not_pgsql_jdbc.yml similarity index 100% rename from tomcat/tasks/not_pgsql_jdbc.yml rename to library/roles/tomcat/tasks/not_pgsql_jdbc.yml diff --git a/tomcat/tasks/pgsql_jdbc.yml b/library/roles/tomcat/tasks/pgsql_jdbc.yml similarity index 100% rename from tomcat/tasks/pgsql_jdbc.yml rename to library/roles/tomcat/tasks/pgsql_jdbc.yml diff --git a/tomcat/tasks/tomcat-admin.yml b/library/roles/tomcat/tasks/tomcat-admin.yml similarity index 100% rename from tomcat/tasks/tomcat-admin.yml rename to library/roles/tomcat/tasks/tomcat-admin.yml diff --git a/tomcat/tasks/tomcat-jmx.yml b/library/roles/tomcat/tasks/tomcat-jmx.yml similarity index 100% rename from tomcat/tasks/tomcat-jmx.yml rename to library/roles/tomcat/tasks/tomcat-jmx.yml diff --git a/tomcat/tasks/tomcat-log4j-logging.yml b/library/roles/tomcat/tasks/tomcat-log4j-logging.yml similarity index 100% rename from tomcat/tasks/tomcat-log4j-logging.yml rename to library/roles/tomcat/tasks/tomcat-log4j-logging.yml diff --git a/tomcat/tasks/tomcat-logger-logging.yml b/library/roles/tomcat/tasks/tomcat-logger-logging.yml similarity index 100% rename from tomcat/tasks/tomcat-logger-logging.yml rename to library/roles/tomcat/tasks/tomcat-logger-logging.yml diff --git a/tomcat/tasks/tomcat-pkgs.yml b/library/roles/tomcat/tasks/tomcat-pkgs.yml similarity index 100% rename from tomcat/tasks/tomcat-pkgs.yml rename to library/roles/tomcat/tasks/tomcat-pkgs.yml diff --git a/tomcat/templates/jmxremote.passwd.j2 b/library/roles/tomcat/templates/jmxremote.passwd.j2 similarity index 100% rename from tomcat/templates/jmxremote.passwd.j2 rename to library/roles/tomcat/templates/jmxremote.passwd.j2 diff --git a/tomcat/templates/log4j.properties.j2 b/library/roles/tomcat/templates/log4j.properties.j2 similarity index 100% rename from tomcat/templates/log4j.properties.j2 rename to library/roles/tomcat/templates/log4j.properties.j2 diff --git a/tomcat/templates/tomcat-default.j2 b/library/roles/tomcat/templates/tomcat-default.j2 similarity index 100% rename from tomcat/templates/tomcat-default.j2 rename to library/roles/tomcat/templates/tomcat-default.j2 diff --git a/tomcat/templates/tomcat-server.xml.j2 b/library/roles/tomcat/templates/tomcat-server.xml.j2 similarity index 100% rename from tomcat/templates/tomcat-server.xml.j2 rename to library/roles/tomcat/templates/tomcat-server.xml.j2 diff --git a/tomcat/templates/tomcat-users.xml.j2 b/library/roles/tomcat/templates/tomcat-users.xml.j2 similarity index 100% rename from tomcat/templates/tomcat-users.xml.j2 rename to library/roles/tomcat/templates/tomcat-users.xml.j2 diff --git a/tomcat/templates/tomcat_access.logrotate.j2 b/library/roles/tomcat/templates/tomcat_access.logrotate.j2 similarity index 100% rename from tomcat/templates/tomcat_access.logrotate.j2 rename to library/roles/tomcat/templates/tomcat_access.logrotate.j2 diff --git a/ubuntu-deb-general/defaults/main.yml b/library/roles/ubuntu-deb-general/defaults/main.yml similarity index 100% rename from ubuntu-deb-general/defaults/main.yml rename to library/roles/ubuntu-deb-general/defaults/main.yml diff --git a/ubuntu-deb-general/files/02proxy b/library/roles/ubuntu-deb-general/files/02proxy similarity index 100% rename from ubuntu-deb-general/files/02proxy rename to library/roles/ubuntu-deb-general/files/02proxy diff --git a/ubuntu-deb-general/files/10-ipv6-disable.conf.modprobe b/library/roles/ubuntu-deb-general/files/10-ipv6-disable.conf.modprobe similarity index 100% rename from ubuntu-deb-general/files/10-ipv6-disable.conf.modprobe rename to library/roles/ubuntu-deb-general/files/10-ipv6-disable.conf.modprobe diff --git a/ubuntu-deb-general/files/10-ipv6-disable.conf.sysctl b/library/roles/ubuntu-deb-general/files/10-ipv6-disable.conf.sysctl similarity index 100% rename from ubuntu-deb-general/files/10-ipv6-disable.conf.sysctl rename to library/roles/ubuntu-deb-general/files/10-ipv6-disable.conf.sysctl diff --git a/ubuntu-deb-general/files/backports-squeeze b/library/roles/ubuntu-deb-general/files/backports-squeeze similarity index 100% rename from ubuntu-deb-general/files/backports-squeeze rename to library/roles/ubuntu-deb-general/files/backports-squeeze diff --git a/ubuntu-deb-general/files/backports-wheezy b/library/roles/ubuntu-deb-general/files/backports-wheezy similarity index 100% rename from ubuntu-deb-general/files/backports-wheezy rename to library/roles/ubuntu-deb-general/files/backports-wheezy diff --git a/ubuntu-deb-general/files/infn-ca-2015.crt b/library/roles/ubuntu-deb-general/files/infn-ca-2015.crt similarity index 100% rename from ubuntu-deb-general/files/infn-ca-2015.crt rename to library/roles/ubuntu-deb-general/files/infn-ca-2015.crt diff --git a/ubuntu-deb-general/files/infn-ca.crt b/library/roles/ubuntu-deb-general/files/infn-ca.crt similarity index 100% rename from ubuntu-deb-general/files/infn-ca.crt rename to library/roles/ubuntu-deb-general/files/infn-ca.crt diff --git a/ubuntu-deb-general/files/infn-letsencrypt-ca.crt b/library/roles/ubuntu-deb-general/files/infn-letsencrypt-ca.crt similarity index 100% rename from ubuntu-deb-general/files/infn-letsencrypt-ca.crt rename to library/roles/ubuntu-deb-general/files/infn-letsencrypt-ca.crt diff --git a/ubuntu-deb-general/handlers/main.yml b/library/roles/ubuntu-deb-general/handlers/main.yml similarity index 100% rename from ubuntu-deb-general/handlers/main.yml rename to library/roles/ubuntu-deb-general/handlers/main.yml diff --git a/ubuntu-deb-general/meta/main.yml b/library/roles/ubuntu-deb-general/meta/main.yml similarity index 100% rename from ubuntu-deb-general/meta/main.yml rename to library/roles/ubuntu-deb-general/meta/main.yml diff --git a/ubuntu-deb-general/tasks/apt-proxy.yml b/library/roles/ubuntu-deb-general/tasks/apt-proxy.yml similarity index 100% rename from ubuntu-deb-general/tasks/apt-proxy.yml rename to library/roles/ubuntu-deb-general/tasks/apt-proxy.yml diff --git a/ubuntu-deb-general/tasks/denyhost.yml b/library/roles/ubuntu-deb-general/tasks/denyhost.yml similarity index 100% rename from ubuntu-deb-general/tasks/denyhost.yml rename to library/roles/ubuntu-deb-general/tasks/denyhost.yml diff --git a/ubuntu-deb-general/tasks/disable-unneeded-services.yml b/library/roles/ubuntu-deb-general/tasks/disable-unneeded-services.yml similarity index 100% rename from ubuntu-deb-general/tasks/disable-unneeded-services.yml rename to library/roles/ubuntu-deb-general/tasks/disable-unneeded-services.yml diff --git a/ubuntu-deb-general/tasks/dist-upgrade.yml b/library/roles/ubuntu-deb-general/tasks/dist-upgrade.yml similarity index 100% rename from ubuntu-deb-general/tasks/dist-upgrade.yml rename to library/roles/ubuntu-deb-general/tasks/dist-upgrade.yml diff --git a/ubuntu-deb-general/tasks/install_external_ca_cert.yml b/library/roles/ubuntu-deb-general/tasks/install_external_ca_cert.yml similarity index 100% rename from ubuntu-deb-general/tasks/install_external_ca_cert.yml rename to library/roles/ubuntu-deb-general/tasks/install_external_ca_cert.yml diff --git a/ubuntu-deb-general/tasks/install_nscd.yml b/library/roles/ubuntu-deb-general/tasks/install_nscd.yml similarity index 100% rename from ubuntu-deb-general/tasks/install_nscd.yml rename to library/roles/ubuntu-deb-general/tasks/install_nscd.yml diff --git a/ubuntu-deb-general/tasks/main.yml b/library/roles/ubuntu-deb-general/tasks/main.yml similarity index 100% rename from ubuntu-deb-general/tasks/main.yml rename to library/roles/ubuntu-deb-general/tasks/main.yml diff --git a/ubuntu-deb-general/tasks/manage_su_limits.yml b/library/roles/ubuntu-deb-general/tasks/manage_su_limits.yml similarity index 100% rename from ubuntu-deb-general/tasks/manage_su_limits.yml rename to library/roles/ubuntu-deb-general/tasks/manage_su_limits.yml diff --git a/ubuntu-deb-general/tasks/munin.yml b/library/roles/ubuntu-deb-general/tasks/munin.yml similarity index 100% rename from ubuntu-deb-general/tasks/munin.yml rename to library/roles/ubuntu-deb-general/tasks/munin.yml diff --git a/ubuntu-deb-general/tasks/ntp.yml b/library/roles/ubuntu-deb-general/tasks/ntp.yml similarity index 100% rename from ubuntu-deb-general/tasks/ntp.yml rename to library/roles/ubuntu-deb-general/tasks/ntp.yml diff --git a/ubuntu-deb-general/tasks/packages.yml b/library/roles/ubuntu-deb-general/tasks/packages.yml similarity index 100% rename from ubuntu-deb-general/tasks/packages.yml rename to library/roles/ubuntu-deb-general/tasks/packages.yml diff --git a/ubuntu-deb-general/tasks/pki-basics-letsencrypt-acme-sh.yml b/library/roles/ubuntu-deb-general/tasks/pki-basics-letsencrypt-acme-sh.yml similarity index 100% rename from ubuntu-deb-general/tasks/pki-basics-letsencrypt-acme-sh.yml rename to library/roles/ubuntu-deb-general/tasks/pki-basics-letsencrypt-acme-sh.yml diff --git a/ubuntu-deb-general/tasks/pki-basics-letsencrypt-acmetool.yml b/library/roles/ubuntu-deb-general/tasks/pki-basics-letsencrypt-acmetool.yml similarity index 100% rename from ubuntu-deb-general/tasks/pki-basics-letsencrypt-acmetool.yml rename to library/roles/ubuntu-deb-general/tasks/pki-basics-letsencrypt-acmetool.yml diff --git a/ubuntu-deb-general/tasks/pki-basics.yml b/library/roles/ubuntu-deb-general/tasks/pki-basics.yml similarity index 100% rename from ubuntu-deb-general/tasks/pki-basics.yml rename to library/roles/ubuntu-deb-general/tasks/pki-basics.yml diff --git a/ubuntu-deb-general/tasks/pubkeys.yml b/library/roles/ubuntu-deb-general/tasks/pubkeys.yml similarity index 100% rename from ubuntu-deb-general/tasks/pubkeys.yml rename to library/roles/ubuntu-deb-general/tasks/pubkeys.yml diff --git a/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml b/library/roles/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml similarity index 100% rename from ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml rename to library/roles/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml diff --git a/ubuntu-deb-general/tasks/resolvconf.yml b/library/roles/ubuntu-deb-general/tasks/resolvconf.yml similarity index 100% rename from ubuntu-deb-general/tasks/resolvconf.yml rename to library/roles/ubuntu-deb-general/tasks/resolvconf.yml diff --git a/ubuntu-deb-general/tasks/rsyslogfix.yml b/library/roles/ubuntu-deb-general/tasks/rsyslogfix.yml similarity index 100% rename from ubuntu-deb-general/tasks/rsyslogfix.yml rename to library/roles/ubuntu-deb-general/tasks/rsyslogfix.yml diff --git a/ubuntu-deb-general/tasks/unattended-upgrades.yml b/library/roles/ubuntu-deb-general/tasks/unattended-upgrades.yml similarity index 100% rename from ubuntu-deb-general/tasks/unattended-upgrades.yml rename to library/roles/ubuntu-deb-general/tasks/unattended-upgrades.yml diff --git a/ubuntu-deb-general/templates/02proxy.j2 b/library/roles/ubuntu-deb-general/templates/02proxy.j2 similarity index 100% rename from ubuntu-deb-general/templates/02proxy.j2 rename to library/roles/ubuntu-deb-general/templates/02proxy.j2 diff --git a/ubuntu-deb-general/templates/10-custom_rules.conf.j2 b/library/roles/ubuntu-deb-general/templates/10-custom_rules.conf.j2 similarity index 100% rename from ubuntu-deb-general/templates/10-custom_rules.conf.j2 rename to library/roles/ubuntu-deb-general/templates/10-custom_rules.conf.j2 diff --git a/ubuntu-deb-general/templates/50unattended-upgrades.j2 b/library/roles/ubuntu-deb-general/templates/50unattended-upgrades.j2 similarity index 100% rename from ubuntu-deb-general/templates/50unattended-upgrades.j2 rename to library/roles/ubuntu-deb-general/templates/50unattended-upgrades.j2 diff --git a/ubuntu-deb-general/templates/ntp.conf.j2 b/library/roles/ubuntu-deb-general/templates/ntp.conf.j2 similarity index 100% rename from ubuntu-deb-general/templates/ntp.conf.j2 rename to library/roles/ubuntu-deb-general/templates/ntp.conf.j2 diff --git a/ubuntu-deb-general/templates/resolv.conf b/library/roles/ubuntu-deb-general/templates/resolv.conf similarity index 100% rename from ubuntu-deb-general/templates/resolv.conf rename to library/roles/ubuntu-deb-general/templates/resolv.conf diff --git a/ubuntu-deb-general/templates/send_nsca.j2 b/library/roles/ubuntu-deb-general/templates/send_nsca.j2 similarity index 100% rename from ubuntu-deb-general/templates/send_nsca.j2 rename to library/roles/ubuntu-deb-general/templates/send_nsca.j2 diff --git a/ubuntu-python-setup/defaults/main.yml b/library/roles/ubuntu-python-setup/defaults/main.yml similarity index 100% rename from ubuntu-python-setup/defaults/main.yml rename to library/roles/ubuntu-python-setup/defaults/main.yml diff --git a/ubuntu-python-setup/files/pip-fixer.sh b/library/roles/ubuntu-python-setup/files/pip-fixer.sh similarity index 100% rename from ubuntu-python-setup/files/pip-fixer.sh rename to library/roles/ubuntu-python-setup/files/pip-fixer.sh diff --git a/ubuntu-python-setup/tasks/main.yml b/library/roles/ubuntu-python-setup/tasks/main.yml similarity index 100% rename from ubuntu-python-setup/tasks/main.yml rename to library/roles/ubuntu-python-setup/tasks/main.yml diff --git a/ubuntugis/defaults/main.yml b/library/roles/ubuntugis/defaults/main.yml similarity index 100% rename from ubuntugis/defaults/main.yml rename to library/roles/ubuntugis/defaults/main.yml diff --git a/ubuntugis/tasks/main.yml b/library/roles/ubuntugis/tasks/main.yml similarity index 100% rename from ubuntugis/tasks/main.yml rename to library/roles/ubuntugis/tasks/main.yml diff --git a/unbound-resolver/defaults/main.yml b/library/roles/unbound-resolver/defaults/main.yml similarity index 100% rename from unbound-resolver/defaults/main.yml rename to library/roles/unbound-resolver/defaults/main.yml diff --git a/unbound-resolver/handlers/main.yml b/library/roles/unbound-resolver/handlers/main.yml similarity index 100% rename from unbound-resolver/handlers/main.yml rename to library/roles/unbound-resolver/handlers/main.yml diff --git a/unbound-resolver/tasks/main.yml b/library/roles/unbound-resolver/tasks/main.yml similarity index 100% rename from unbound-resolver/tasks/main.yml rename to library/roles/unbound-resolver/tasks/main.yml diff --git a/unbound-resolver/templates/unbound-remote-control.conf b/library/roles/unbound-resolver/templates/unbound-remote-control.conf similarity index 100% rename from unbound-resolver/templates/unbound-remote-control.conf rename to library/roles/unbound-resolver/templates/unbound-remote-control.conf diff --git a/unbound-resolver/templates/unbound-server.conf b/library/roles/unbound-resolver/templates/unbound-server.conf similarity index 100% rename from unbound-resolver/templates/unbound-server.conf rename to library/roles/unbound-resolver/templates/unbound-server.conf diff --git a/user_services_perms/defaults/main.yml b/library/roles/user_services_perms/defaults/main.yml similarity index 100% rename from user_services_perms/defaults/main.yml rename to library/roles/user_services_perms/defaults/main.yml diff --git a/user_services_perms/meta/main.yml b/library/roles/user_services_perms/meta/main.yml similarity index 100% rename from user_services_perms/meta/main.yml rename to library/roles/user_services_perms/meta/main.yml diff --git a/user_services_perms/tasks/common-users-data-dirs.yml b/library/roles/user_services_perms/tasks/common-users-data-dirs.yml similarity index 100% rename from user_services_perms/tasks/common-users-data-dirs.yml rename to library/roles/user_services_perms/tasks/common-users-data-dirs.yml diff --git a/user_services_perms/tasks/main.yml b/library/roles/user_services_perms/tasks/main.yml similarity index 100% rename from user_services_perms/tasks/main.yml rename to library/roles/user_services_perms/tasks/main.yml diff --git a/user_services_perms/tasks/sudo-config.yml b/library/roles/user_services_perms/tasks/sudo-config.yml similarity index 100% rename from user_services_perms/tasks/sudo-config.yml rename to library/roles/user_services_perms/tasks/sudo-config.yml diff --git a/user_services_perms/tasks/sudoers-groups.yml b/library/roles/user_services_perms/tasks/sudoers-groups.yml similarity index 100% rename from user_services_perms/tasks/sudoers-groups.yml rename to library/roles/user_services_perms/tasks/sudoers-groups.yml diff --git a/user_services_perms/templates/service-sudoers.j2 b/library/roles/user_services_perms/templates/service-sudoers.j2 similarity index 100% rename from user_services_perms/templates/service-sudoers.j2 rename to library/roles/user_services_perms/templates/service-sudoers.j2 diff --git a/users/defaults/main.yml b/library/roles/users/defaults/main.yml similarity index 100% rename from users/defaults/main.yml rename to library/roles/users/defaults/main.yml diff --git a/users/tasks/main.yml b/library/roles/users/tasks/main.yml similarity index 100% rename from users/tasks/main.yml rename to library/roles/users/tasks/main.yml diff --git a/users/templates/sudoers.j2 b/library/roles/users/templates/sudoers.j2 similarity index 100% rename from users/templates/sudoers.j2 rename to library/roles/users/templates/sudoers.j2 diff --git a/vagrant/defaults/main.yml b/library/roles/vagrant/defaults/main.yml similarity index 100% rename from vagrant/defaults/main.yml rename to library/roles/vagrant/defaults/main.yml diff --git a/vagrant/tasks/main.yml b/library/roles/vagrant/tasks/main.yml similarity index 100% rename from vagrant/tasks/main.yml rename to library/roles/vagrant/tasks/main.yml diff --git a/varnish-cache/defaults/main.yml b/library/roles/varnish-cache/defaults/main.yml similarity index 100% rename from varnish-cache/defaults/main.yml rename to library/roles/varnish-cache/defaults/main.yml diff --git a/varnish-cache/files/varnish-sepol.te b/library/roles/varnish-cache/files/varnish-sepol.te similarity index 100% rename from varnish-cache/files/varnish-sepol.te rename to library/roles/varnish-cache/files/varnish-sepol.te diff --git a/varnish-cache/handlers/main.yml b/library/roles/varnish-cache/handlers/main.yml similarity index 100% rename from varnish-cache/handlers/main.yml rename to library/roles/varnish-cache/handlers/main.yml diff --git a/varnish-cache/tasks/main.yml b/library/roles/varnish-cache/tasks/main.yml similarity index 100% rename from varnish-cache/tasks/main.yml rename to library/roles/varnish-cache/tasks/main.yml diff --git a/varnish-cache/templates/varnish.params.j2 b/library/roles/varnish-cache/templates/varnish.params.j2 similarity index 100% rename from varnish-cache/templates/varnish.params.j2 rename to library/roles/varnish-cache/templates/varnish.params.j2 diff --git a/varnish-cache/templates/varnish.service.systemd.j2 b/library/roles/varnish-cache/templates/varnish.service.systemd.j2 similarity index 100% rename from varnish-cache/templates/varnish.service.systemd.j2 rename to library/roles/varnish-cache/templates/varnish.service.systemd.j2 diff --git a/virtuoso/defaults/main.yml b/library/roles/virtuoso/defaults/main.yml similarity index 100% rename from virtuoso/defaults/main.yml rename to library/roles/virtuoso/defaults/main.yml diff --git a/virtuoso/handlers/main.yml b/library/roles/virtuoso/handlers/main.yml similarity index 100% rename from virtuoso/handlers/main.yml rename to library/roles/virtuoso/handlers/main.yml diff --git a/virtuoso/tasks/main.yml b/library/roles/virtuoso/tasks/main.yml similarity index 100% rename from virtuoso/tasks/main.yml rename to library/roles/virtuoso/tasks/main.yml diff --git a/virtuoso/tasks/manage-service.yml b/library/roles/virtuoso/tasks/manage-service.yml similarity index 100% rename from virtuoso/tasks/manage-service.yml rename to library/roles/virtuoso/tasks/manage-service.yml diff --git a/virtuoso/tasks/virtuoso-conf.yml b/library/roles/virtuoso/tasks/virtuoso-conf.yml similarity index 100% rename from virtuoso/tasks/virtuoso-conf.yml rename to library/roles/virtuoso/tasks/virtuoso-conf.yml diff --git a/virtuoso/tasks/virtuoso-dba-user.yml b/library/roles/virtuoso/tasks/virtuoso-dba-user.yml similarity index 100% rename from virtuoso/tasks/virtuoso-dba-user.yml rename to library/roles/virtuoso/tasks/virtuoso-dba-user.yml diff --git a/virtuoso/tasks/virtuoso-pkgs.yml b/library/roles/virtuoso/tasks/virtuoso-pkgs.yml similarity index 100% rename from virtuoso/tasks/virtuoso-pkgs.yml rename to library/roles/virtuoso/tasks/virtuoso-pkgs.yml diff --git a/vsftpd/defaults/main.yml b/library/roles/vsftpd/defaults/main.yml similarity index 100% rename from vsftpd/defaults/main.yml rename to library/roles/vsftpd/defaults/main.yml diff --git a/vsftpd/handlers/main.yml b/library/roles/vsftpd/handlers/main.yml similarity index 100% rename from vsftpd/handlers/main.yml rename to library/roles/vsftpd/handlers/main.yml diff --git a/vsftpd/tasks/main.yml b/library/roles/vsftpd/tasks/main.yml similarity index 100% rename from vsftpd/tasks/main.yml rename to library/roles/vsftpd/tasks/main.yml diff --git a/vsftpd/templates/vsftpd.conf.j2 b/library/roles/vsftpd/templates/vsftpd.conf.j2 similarity index 100% rename from vsftpd/templates/vsftpd.conf.j2 rename to library/roles/vsftpd/templates/vsftpd.conf.j2 diff --git a/wordpress/defaults/main.yml b/library/roles/wordpress/defaults/main.yml similarity index 100% rename from wordpress/defaults/main.yml rename to library/roles/wordpress/defaults/main.yml diff --git a/wordpress/meta/main.yml b/library/roles/wordpress/meta/main.yml similarity index 100% rename from wordpress/meta/main.yml rename to library/roles/wordpress/meta/main.yml diff --git a/wordpress/tasks/main.yml b/library/roles/wordpress/tasks/main.yml similarity index 100% rename from wordpress/tasks/main.yml rename to library/roles/wordpress/tasks/main.yml diff --git a/wordpress/tasks/wp_install.yml b/library/roles/wordpress/tasks/wp_install.yml similarity index 100% rename from wordpress/tasks/wp_install.yml rename to library/roles/wordpress/tasks/wp_install.yml diff --git a/wordpress/tasks/wp_nginx.yml b/library/roles/wordpress/tasks/wp_nginx.yml similarity index 100% rename from wordpress/tasks/wp_nginx.yml rename to library/roles/wordpress/tasks/wp_nginx.yml diff --git a/wordpress/tasks/wp_plugins.yml b/library/roles/wordpress/tasks/wp_plugins.yml similarity index 100% rename from wordpress/tasks/wp_plugins.yml rename to library/roles/wordpress/tasks/wp_plugins.yml diff --git a/wordpress/tasks/wp_prerequisites.yml b/library/roles/wordpress/tasks/wp_prerequisites.yml similarity index 100% rename from wordpress/tasks/wp_prerequisites.yml rename to library/roles/wordpress/tasks/wp_prerequisites.yml diff --git a/wordpress/templates/nginx_wordpress.conf b/library/roles/wordpress/templates/nginx_wordpress.conf similarity index 100% rename from wordpress/templates/nginx_wordpress.conf rename to library/roles/wordpress/templates/nginx_wordpress.conf diff --git a/wordpress/templates/wp-config.php b/library/roles/wordpress/templates/wp-config.php similarity index 100% rename from wordpress/templates/wp-config.php rename to library/roles/wordpress/templates/wp-config.php diff --git a/wordpress/vars/main.yml b/library/roles/wordpress/vars/main.yml similarity index 100% rename from wordpress/vars/main.yml rename to library/roles/wordpress/vars/main.yml diff --git a/yii/defaults/main.yml b/library/roles/yii/defaults/main.yml similarity index 100% rename from yii/defaults/main.yml rename to library/roles/yii/defaults/main.yml diff --git a/yii/meta/main.yml b/library/roles/yii/meta/main.yml similarity index 100% rename from yii/meta/main.yml rename to library/roles/yii/meta/main.yml diff --git a/yii/tasks/main.yml b/library/roles/yii/tasks/main.yml similarity index 100% rename from yii/tasks/main.yml rename to library/roles/yii/tasks/main.yml diff --git a/zulip/defaults/main.yml b/library/roles/zulip/defaults/main.yml similarity index 100% rename from zulip/defaults/main.yml rename to library/roles/zulip/defaults/main.yml diff --git a/zulip/files/nginx-letsencrypt-acme.sh b/library/roles/zulip/files/nginx-letsencrypt-acme.sh similarity index 100% rename from zulip/files/nginx-letsencrypt-acme.sh rename to library/roles/zulip/files/nginx-letsencrypt-acme.sh diff --git a/zulip/tasks/main.yml b/library/roles/zulip/tasks/main.yml similarity index 100% rename from zulip/tasks/main.yml rename to library/roles/zulip/tasks/main.yml diff --git a/zulip/tasks/zulip-letsencrypt.yml b/library/roles/zulip/tasks/zulip-letsencrypt.yml similarity index 100% rename from zulip/tasks/zulip-letsencrypt.yml rename to library/roles/zulip/tasks/zulip-letsencrypt.yml diff --git a/zulip/tasks/zulip.yml b/library/roles/zulip/tasks/zulip.yml similarity index 100% rename from zulip/tasks/zulip.yml rename to library/roles/zulip/tasks/zulip.yml diff --git a/smartgears/accounting-service/defaults/main.yml b/smartgears/accounting-service/defaults/main.yml deleted file mode 100644 index 08de8564..00000000 --- a/smartgears/accounting-service/defaults/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -accounting_service_install: False -accounting_service_version: latest -smart_executor_context: /accounting-service -accounting_service_name: accounting-service -accounting_service_extension: war -accounting_service_file: '{{ accounting_service_name }}-{{ accounting_service_version }}.{{ accounting_service_extension }}' -accounting_service_group_id: org.gcube.accounting - -accounting_service_library_name: document-store-lib-accounting-service -#accounting_service_library_classifier: jar-with-dependencies -accounting_couchbase_library_classifier: uberjar -accounting_couchbase_library_name: document-store-lib-couchbase -accounting_couchbase_library_extension: jar - -accounting_couchbase_library_version: latest -accounting_couchbase_library_group_id: org.gcube.data.publishing -couchbase_uber_file: '{{ accounting_couchbase_library_name }}-{{ accounting_couchbase_library_version }}-{{ accounting_couchbase_library_classifier }}.{{ accounting_couchbase_library_extension }}' - diff --git a/smartgears/accounting-service/tasks/main.yml b/smartgears/accounting-service/tasks/main.yml deleted file mode 100644 index 0ac797cb..00000000 --- a/smartgears/accounting-service/tasks/main.yml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- block: - - name: Remove the accounting service app - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ accounting_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ accounting_service_name }}.{{ accounting_service_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not accounting_service_install - tags: [ 'smartgears', 'accounting_service', 'tomcat' ] - -- block: - - name: Get the accounting_service war - maven_artifact: artifact_id={{ accounting_service_name }} version={{ accounting_service_version | default('latest') }} group_id={{ accounting_service_group_id }} extension={{ accounting_service_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ accounting_service_file }} - register: accounting_download - - - name: Remove the old accounting service app - file: dest={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }} state=absent - when: accounting_download is changed - -# - name: Remove the accounting service library -# shell: rm -fr {{ smartgears_instance_path }}/lib/{{ accounting_service_library_name }}-* -# when: accounting_download is changed - -# - name: Remove the accounting couchbase library if present -# shell: rm -fr {{ smartgears_instance_path }}/lib/{{ accounting_couchbase_library_name }}-* -# when: accounting_download is changed - -# - name: Get the couchbase library -# maven_artifact: artifact_id={{ accounting_couchbase_library_name }} version={{ accounting_couchbase_library_version | default('latest') }} group_id={{ accounting_couchbase_library_group_id }} extension={{ accounting_couchbase_library_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ accounting_service_library_classifier }} dest={{ smartgears_instance_path }}/lib -# when: accounting_download is changed - - - name: Remove the accounting couchbase libraries if presents - shell: rm -fr {{ smartgears_instance_path }}/lib/couchbase - when: accounting_download is changed - - - - name: Create the couchbase directory inside tomcat/lib - file: dest={{ smartgears_instance_path }}/lib/couchbase state=directory - register: couchbase_create_dir - - - name: Get the couchbase uberjar library - maven_artifact: artifact_id={{ accounting_couchbase_library_name }} version={{ accounting_couchbase_library_version | default('latest') }} group_id={{ accounting_couchbase_library_group_id }} extension={{ accounting_couchbase_library_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ accounting_couchbase_library_classifier }} dest={{ smartgears_downloads_dir }}//{{ couchbase_uber_file }} - when: accounting_download is changed - - - name: Unarchive the couchbase uber jar - unarchive: src={{ smartgears_downloads_dir }}/{{ couchbase_uber_file }} dest={{ smartgears_instance_path }}/lib/couchbase/ copy=no - when: couchbase_create_dir is changed - notify: Restart smartgears - - - name: Download the couchbase jar file - maven_artifact: artifact_id={{ accounting_couchbase_library_name }} version={{ accounting_couchbase_library_version }} group_id={{ accounting_couchbase_library_group_id }} extension={{ accounting_couchbase_library_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/lib/couchbase/ keep_name=yes - notify: Restart smartgears - - - name: Remove the couchbase uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/lib/couchbase/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - - - name: Copy the accounting_service war file to the destination place - copy: src={{ smartgears_downloads_dir }}/{{ accounting_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }}.{{ accounting_service_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: accounting_service_install - tags: [ 'smartgears', 'accounting_service', 'tomcat' ] diff --git a/smartgears/accounting_aggregator_se_plugin/defaults/main.yml b/smartgears/accounting_aggregator_se_plugin/defaults/main.yml deleted file mode 100644 index 76cfe2e0..00000000 --- a/smartgears/accounting_aggregator_se_plugin/defaults/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -accounting_aggregator_se_plugin_install: False -accounting_aggregator_se_plugin_upgrade: False -accounting_aggregator_se_plugin_version: latest - -accounting_aggregator_se_plugin_group_id: 'org.gcube.accounting' -accounting_aggregator_se_plugin_name: 'accounting-aggregator-se-plugin' -accounting_aggregator_se_plugin_extension: 'jar' -accounting_aggregator_se_plugin_classifier: 'uberjar' -accounting_aggregator_se_plugin_uber_file: '{{ accounting_aggregator_se_plugin_name }}-{{ accounting_aggregator_se_plugin_version }}-{{ accounting_aggregator_se_plugin_classifier }}.{{ accounting_aggregator_se_plugin_extension }}' -accounting_aggregator_se_plugin_file: '{{ accounting_aggregator_se_plugin_name }}-{{ accounting_aggregator_se_plugin_version }}.{{ accounting_aggregator_se_plugin_extension }}' - -catalina_apps_conf: - - { app_name: '{{ smart_executor_name }}', plugin_name: '{{ accounting_aggregator_se_plugin_name }}' } - -# Note: the deb package nco is required diff --git a/smartgears/accounting_aggregator_se_plugin/meta/main.yml b/smartgears/accounting_aggregator_se_plugin/meta/main.yml deleted file mode 100644 index 2510b86d..00000000 --- a/smartgears/accounting_aggregator_se_plugin/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: '../library/roles/smartgears/catalina-app-conf' - diff --git a/smartgears/accounting_aggregator_se_plugin/tasks/main.yml b/smartgears/accounting_aggregator_se_plugin/tasks/main.yml deleted file mode 100644 index 44b39a02..00000000 --- a/smartgears/accounting_aggregator_se_plugin/tasks/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- block: - - name: Remove the accounting_aggregator smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_aggregator_se_plugin_name }} state=absent - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not accounting_aggregator_se_plugin_install - tags: [ 'smartgears', 'accounting_aggregator_se', 'tomcat' ] - - -- block: - - name: Download the accounting_aggregator plugin uber jar - maven_artifact: artifact_id={{ accounting_aggregator_se_plugin_name }} version={{ accounting_aggregator_se_plugin_version | default('latest') }} group_id={{ accounting_aggregator_se_plugin_group_id }} extension={{ accounting_aggregator_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ accounting_aggregator_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ accounting_aggregator_se_plugin_uber_file }} - register: accounting_aggregator_download - - - name: Remove the old accounting_aggregator smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_aggregator_se_plugin_name }} state=absent - when: accounting_aggregator_download is changed - notify: Restart smartgears - - - name: Create the plugin directory inside the smart executor - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_aggregator_se_plugin_name }} state=directory - register: accounting_aggregator_create_dir - - - name: Unarchive the accounting_aggregator uber jar to expose its libraries - unarchive: src={{ smartgears_downloads_dir }}/{{ accounting_aggregator_se_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_aggregator_se_plugin_name }}/ copy=no - when: accounting_aggregator_create_dir is changed - notify: Restart smartgears - - - name: Download the accounting_aggregator plugin jar file - maven_artifact: artifact_id={{ accounting_aggregator_se_plugin_name }} version={{ accounting_aggregator_se_plugin_version }} group_id={{ accounting_aggregator_se_plugin_group_id }} extension={{ accounting_aggregator_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_aggregator_se_plugin_name }} keep_name=yes - notify: Restart smartgears - - - name: Remove the accounting_aggregator uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_aggregator_se_plugin_name }}/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - - name: Install the nco package - become_user: root - apt: pkg=nco state=present update_cache=yes cache_valid_time=1800 - - become: True - become_user: '{{ smartgears_user }}' - when: accounting_aggregator_se_plugin_install - tags: [ 'smartgears', 'accounting_aggregator_se', 'tomcat' ] diff --git a/smartgears/accounting_dashboard_harvester_se_plugin/defaults/main.yml b/smartgears/accounting_dashboard_harvester_se_plugin/defaults/main.yml deleted file mode 100644 index caac042c..00000000 --- a/smartgears/accounting_dashboard_harvester_se_plugin/defaults/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -accounting_dashboard_harvester_se_plugin_install: False -accounting_dashboard_harvester_se_plugin_upgrade: False -accounting_dashboard_harvester_se_plugin_version: latest - -accounting_dashboard_harvester_se_plugin_group_id: 'org.gcube.accounting' -accounting_dashboard_harvester_se_plugin_name: 'accounting-dashboard-harvester-se-plugin' -accounting_dashboard_harvester_se_plugin_extension: 'jar' -accounting_dashboard_harvester_se_plugin_classifier: 'uberjar' -accounting_dashboard_harvester_se_plugin_uber_file: '{{ accounting_dashboard_harvester_se_plugin_name }}-{{ accounting_dashboard_harvester_se_plugin_version }}-{{ accounting_dashboard_harvester_se_plugin_classifier }}.{{ accounting_dashboard_harvester_se_plugin_extension }}' -accounting_dashboard_harvester_se_plugin_file: '{{ accounting_dashboard_harvester_se_plugin_name }}-{{ accounting_dashboard_harvester_se_plugin_version }}.{{ accounting_dashboard_harvester_se_plugin_extension }}' - -accounting_dashboard_harvester_se_plugin_requester_username: 'foo' -accounting_dashboard_harvester_se_plugin_application_token_name: 'accounting-harvester' - - -catalina_apps_conf: - - { app_name: '{{ smart_executor_name }}', plugin_name: '{{ accounting_dashboard_harvester_se_plugin_name }}' } - diff --git a/smartgears/accounting_dashboard_harvester_se_plugin/meta/main.yml b/smartgears/accounting_dashboard_harvester_se_plugin/meta/main.yml deleted file mode 100644 index 2510b86d..00000000 --- a/smartgears/accounting_dashboard_harvester_se_plugin/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: '../library/roles/smartgears/catalina-app-conf' - diff --git a/smartgears/accounting_dashboard_harvester_se_plugin/tasks/main.yml b/smartgears/accounting_dashboard_harvester_se_plugin/tasks/main.yml deleted file mode 100644 index b64aa2a3..00000000 --- a/smartgears/accounting_dashboard_harvester_se_plugin/tasks/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- block: - - name: Remove the accounting_dashboard_harvester smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_dashboard_harvester_se_plugin_name }} state=absent - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not accounting_dashboard_harvester_se_plugin_install - tags: [ 'smartgears', 'accounting_dashboard_harvester_se', 'tomcat' ] - - -- block: - - name: Download the accounting_dashboard_harvester plugin uber jar - maven_artifact: artifact_id={{ accounting_dashboard_harvester_se_plugin_name }} version={{ accounting_dashboard_harvester_se_plugin_version | default('latest') }} group_id={{ accounting_dashboard_harvester_se_plugin_group_id }} extension={{ accounting_dashboard_harvester_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ accounting_dashboard_harvester_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ accounting_dashboard_harvester_se_plugin_uber_file }} verify_checksum=always - register: accounting_dashboard_harvester_download - - - name: Remove the old accounting_dashboard_harvester smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_dashboard_harvester_se_plugin_name }} state=absent - when: accounting_dashboard_harvester_download is changed - notify: Restart smartgears - - - name: Create the plugin directory inside the smart executor - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_dashboard_harvester_se_plugin_name }} state=directory - register: accounting_dashboard_harvester_create_dir - - - name: Unarchive the accounting_dashboard_harvester uber jar to expose its libraries - unarchive: src={{ smartgears_downloads_dir }}/{{ accounting_dashboard_harvester_se_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_dashboard_harvester_se_plugin_name }}/ copy=no - when: accounting_dashboard_harvester_create_dir is changed - notify: Restart smartgears - - - name: Download the accounting_dashboard_harvester plugin jar file - maven_artifact: artifact_id={{ accounting_dashboard_harvester_se_plugin_name }} version={{ accounting_dashboard_harvester_se_plugin_version }} group_id={{ accounting_dashboard_harvester_se_plugin_group_id }} extension={{ accounting_dashboard_harvester_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_dashboard_harvester_se_plugin_name }} keep_name=yes - notify: Restart smartgears - - - name: Install the accounting_dashboard_harvester plugin configuration - template: src=config.properties.j2 dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/classes/config.properties mode=0440 - notify: Restart smartgears - - - name: Remove the accounting_dashboard_harvester uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ accounting_dashboard_harvester_se_plugin_name }}/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: accounting_dashboard_harvester_se_plugin_install - tags: [ 'smartgears', 'accounting_dashboard_harvester_se', 'tomcat' ] diff --git a/smartgears/accounting_dashboard_harvester_se_plugin/templates/config.properties.j2 b/smartgears/accounting_dashboard_harvester_se_plugin/templates/config.properties.j2 deleted file mode 100644 index 27283ccd..00000000 --- a/smartgears/accounting_dashboard_harvester_se_plugin/templates/config.properties.j2 +++ /dev/null @@ -1,2 +0,0 @@ -USERNAME={{ accounting_dashboard_harvester_se_plugin_requester_username }} -SERVICE_NAME={{ accounting_dashboard_harvester_se_plugin_application_token_name }} diff --git a/smartgears/accounting_rstudio_se_plugin/defaults/main.yml b/smartgears/accounting_rstudio_se_plugin/defaults/main.yml deleted file mode 100644 index 70fd4ab8..00000000 --- a/smartgears/accounting_rstudio_se_plugin/defaults/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -accounting_insert_rstudio_se_plugin_install: False -accounting_insert_rstudio_se_plugin_name: accounting-insert-rstudio-se-plugin - -accounting_insert_rstudio_se_plugin_version: 'latest' -accounting_insert_rstudio_se_plugin_group_id: 'org.gcube.accounting' -accounting_insert_rstudio_se_plugin_artifact_id: accounting-insert-rstudio-se-plugin -accounting_insert_rstudio_se_plugin_extension: jar -accounting_insert_rstudio_se_plugin_classifier: jar-with-dependencies -accounting_insert_rstudio_se_plugin_file: '{{ accounting_insert_rstudio_se_plugin_name }}-{{ accounting_insert_rstudio_se_plugin_version }}-{{ accounting_insert_rstudio_se_plugin_classifier }}.{{ accounting_insert_rstudio_se_plugin_extension }}' - -accounting_rstudio_quota_dest_dir: /srv/d4science -accounting_rstudio_quota_dest_file: '{{ accounting_rstudio_quota_dest_dir }}/home_disk_space' diff --git a/smartgears/accounting_rstudio_se_plugin/tasks/main.yml b/smartgears/accounting_rstudio_se_plugin/tasks/main.yml deleted file mode 100644 index 5ae0e099..00000000 --- a/smartgears/accounting_rstudio_se_plugin/tasks/main.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- block: - - name: Remove the old accounting insert storage plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ accounting_insert_rstudio_se_plugin_artifact_id }}-*-{{ accounting_insert_rstudio_se_plugin_classifier }}.{{ accounting_insert_rstudio_se_plugin_extension }} - notify: Restart smartgears - - - name: Disable the cron job that calculates the home used space - cron: name="Calculate the home used space" special_time=hourly user=root job="/usr/local/bin/calculate_home_space >/dev/null 2>&1" state=absent - - become: True - become_user: '{{ smartgears_user }}' - when: not accounting_insert_rstudio_se_plugin_install - tags: [ 'smartgears', 'accounting_insert_rstudio_se', 'tomcat' ] - -- block: - - name: Get the accounting insert storage plugin and install it inside the smart executor - maven_artifact: artifact_id={{ accounting_insert_rstudio_se_plugin_name }} version={{ accounting_insert_rstudio_se_plugin_version | default(omit) }} group_id={{ accounting_insert_rstudio_se_plugin_group_id }} extension={{ accounting_insert_rstudio_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ accounting_insert_rstudio_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ accounting_insert_rstudio_se_plugin_file }} - register: accounting_insert_rstudio_download - - - name: Remove the old accounting insert storage plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ accounting_insert_rstudio_se_plugin_artifact_id }}-*-{{ accounting_insert_rstudio_se_plugin_classifier }}.{{ accounting_insert_rstudio_se_plugin_extension }} - when: accounting_insert_rstudio_download is changed - - - name: Copy the accounting aggregator plugin to its final destination - copy: src={{ smartgears_downloads_dir }}/{{ accounting_insert_rstudio_se_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ accounting_insert_rstudio_se_plugin_file }} remote_src=yes - notify: Restart smartgears - - - name: Install the script that calculates the occupied space for each user - become_user: root - template: src=calculate_home_space.j2 dest=/usr/local/bin/calculate_home_space mode=0755 owner=root group=root - - - name: Install a cron job that calculates the home used space - become_user: root - cron: name="Calculate the home used space" special_time=hourly user=root job="/usr/local/bin/calculate_home_space >/dev/null 2>&1" - - become: True - become_user: '{{ smartgears_user }}' - when: accounting_insert_rstudio_se_plugin_install - tags: [ 'smartgears', 'accounting_insert_rstudio_se', 'tomcat' ] - diff --git a/smartgears/accounting_rstudio_se_plugin/templates/calculate_home_space.j2 b/smartgears/accounting_rstudio_se_plugin/templates/calculate_home_space.j2 deleted file mode 100644 index 2bf2bf3a..00000000 --- a/smartgears/accounting_rstudio_se_plugin/templates/calculate_home_space.j2 +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -DEST_FILE={{ accounting_rstudio_quota_dest_file }} -mkdir -p {{ accounting_rstudio_quota_dest_dir }} - -> $DEST_FILE -cd /home ; for h in $( /bin/ls -1 . | grep -v gcube ) ; do du -s ${h} >> $DEST_FILE ; done - -exit 0 diff --git a/smartgears/catalina-app-conf/tasks/main.yml b/smartgears/catalina-app-conf/tasks/main.yml deleted file mode 100644 index 84aa3a3e..00000000 --- a/smartgears/catalina-app-conf/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- block: - - name: Install the catalina webapp configurations with distro <=16 - template: src=catalina-app-conf.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/{{ item.app_name }}.xml - with_items: '{{ catalina_apps_conf }}' - when: ( item.state | default(True) ) and ansible_distribution_major_version <= '16' - - - name: Install the catalina webapp configurations with distro == 18 - template: src=catalina-app-conf_tomcat8.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/{{ item.app_name }}.xml - with_items: '{{ catalina_apps_conf }}' - when: ( item.state | default(True) ) and ansible_distribution_major_version == '18' - - - name: Remove the catalina webapp configurations - file: dest={{ smartgears_instance_path }}/conf/Catalina/localhost/{{ item.app_name }}.xml state=absent - with_items: '{{ catalina_apps_conf }}' - when: ( not item.state | default(True) ) - - become: True - become_user: '{{ smartgears_user }}' - when: catalina_apps_conf is defined - tags: [ 'smartgears', 'tomcat', 'catalina_apps' ] - diff --git a/smartgears/catalina-app-conf/templates/catalina-app-conf.xml.j2 b/smartgears/catalina-app-conf/templates/catalina-app-conf.xml.j2 deleted file mode 100644 index 26952a64..00000000 --- a/smartgears/catalina-app-conf/templates/catalina-app-conf.xml.j2 +++ /dev/null @@ -1,12 +0,0 @@ - - - - -{% else %} -{% for plugin in item.app_plugins %} - virtualClasspath="{{ smartgears_instance_path }}/webapps/{{ item.app_name }}/WEB-INF/lib/plugins/{{ plugin }}/*.jar"/> -{% endfor %} -{% endif %} - diff --git a/smartgears/catalina-app-conf/templates/catalina-app-conf_tomcat8.xml.j2 b/smartgears/catalina-app-conf/templates/catalina-app-conf_tomcat8.xml.j2 deleted file mode 100644 index f5080172..00000000 --- a/smartgears/catalina-app-conf/templates/catalina-app-conf_tomcat8.xml.j2 +++ /dev/null @@ -1,19 +0,0 @@ - - - -{% if item.plugin_name is defined %} - -{% else %} -{% for plugin in item.app_plugins %} - -{% endfor %} -{% endif %} - - - diff --git a/smartgears/catalogue_ws/defaults/main.yml b/smartgears/catalogue_ws/defaults/main.yml deleted file mode 100644 index fa8ff209..00000000 --- a/smartgears/catalogue_ws/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -catalogue_ws_install: False -catalogue_ws_version: latest -catalogue_ws_name: catalogue-ws - -catalogue_ws_group_id: org.gcube.data-catalogue -catalogue_ws_extension: war -catalogue_ws_file: '{{ catalogue_ws_name }}-{{ catalogue_ws_version }}.{{ catalogue_ws_extension }}' - diff --git a/smartgears/catalogue_ws/tasks/main.yml b/smartgears/catalogue_ws/tasks/main.yml deleted file mode 100644 index fcc81484..00000000 --- a/smartgears/catalogue_ws/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- block: - - name: Remove the old catalogue ws files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ catalogue_ws_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ catalogue_ws_name }}.{{ catalogue_ws_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not catalogue_ws_install - tags: [ 'catalogue_ws' ] - -- block: - - name: Get the catalogue-ws - maven_artifact: artifact_id={{ catalogue_ws_name }} version={{ catalogue_ws_version | default(omit) }} group_id={{ catalogue_ws_group_id }} extension={{ catalogue_ws_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ catalogue_ws_file }} - register: catalogue_ws_download - - - name: Remove the old catalogue ws files - file: path={{ smartgears_instance_path }}/webapps/{{ catalogue_ws_name }} state=absent - when: catalogue_ws_download is changed - - - name: Copy the catalogue ws war into the tomcat webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ catalogue_ws_file }} dest={{ smartgears_instance_path }}/webapps/{{ catalogue_ws_name }}.{{ catalogue_ws_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: catalogue_ws_install - tags: [ 'catalogue_ws' ] - diff --git a/smartgears/ckan_connector/defaults/main.yml b/smartgears/ckan_connector/defaults/main.yml deleted file mode 100644 index d4aa4b33..00000000 --- a/smartgears/ckan_connector/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -ckan_connector_gcube_repository: 'gcube-staging' -ckan_connector_plugin_install: False -ckan_connector_ver: latest -ckan_connector_name: ckan-connector -ckan_connector_extension: war -ckan_connector_group_id: org.gcube.data.access -ckan_connector_filename: '{{ ckan_connector_name }}-{{ ckan_connector_ver }}.{{ ckan_connector_extension }}' - -ckan_connector_user: ckan_connector diff --git a/smartgears/ckan_connector/tasks/main.yml b/smartgears/ckan_connector/tasks/main.yml deleted file mode 100644 index 5ba7a4d1..00000000 --- a/smartgears/ckan_connector/tasks/main.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- -- block: - - name: Remove the installed CKAN connector - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ ckan_connector_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ ckan_connector_name }}.{{ ckan_connector_extension }}' - notify: Restart smartgears - - - name: Remove the CKAN connector fixer script - become_user: root - file: dest=/usr/local/bin/ckan-connector-fixer state=absent - - become: True - become_user: '{{ smartgears_user }}' - when: not ckan_connector_plugin_install - tags: [ 'smartgears', 'ckan', 'ckan_connector', 'tomcat' ] - -- block: - - name: Get the CKAN connector war file - maven_artifact: artifact_id={{ ckan_connector_name }} version={{ ckan_connector_ver }} group_id={{ ckan_connector_group_id }} extension={{ ckan_connector_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ ckan_connector_filename }} - register: ckan_connector_download - - - name: Remove the installed CKAN connector before upgrading - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ ckan_connector_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ ckan_connector_name }}.{{ ckan_connector_extension }}' - when: ckan_connector_download is changed - notify: Restart smartgears - - - name: Create the CKAN connector webapp directory - file: dest={{ smartgears_instance_path }}/webapps/{{ ckan_connector_name }} state=directory - when: ckan_connector_download is changed - - - name: Unarchive the CKAN connector war file - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ ckan_connector_filename }} dest={{ smartgears_instance_path }}/webapps/{{ ckan_connector_name }} - args: - creates: '{{ smartgears_instance_path }}/webapps/{{ ckan_connector_name }}/WEB-INF/web.xml' - notify: Restart smartgears - - - name: Install the CKAN connector web.xml template - template: src=ckan-web.xml.j2 dest={{ smartgears_instance_path }}/webapps/ckan-connector/WEB-INF/.web.xml.tpl mode=0440 - - - name: Install the CKAN connector fixer script - become_user: root - template: src=ckan-connector-fixer.sh.j2 dest=/usr/local/bin/ckan-connector-fixer owner=root group=root mode=0550 - - - name: Fix the CKAN connector web.xml - become_user: root - shell: /usr/local/bin/ckan-connector-fixer init - args: - creates: '{{ smartgears_instance_path }}/webapps/ckan-connector/WEB-INF/.web.xml.configured' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: ckan_connector_plugin_install - tags: [ 'smartgears', 'ckan', 'ckan_connector', 'tomcat' ] diff --git a/smartgears/ckan_connector/templates/ckan-connector-fixer.sh.j2 b/smartgears/ckan_connector/templates/ckan-connector-fixer.sh.j2 deleted file mode 100644 index 9c0481b3..00000000 --- a/smartgears/ckan_connector/templates/ckan-connector-fixer.sh.j2 +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ] ; then - logger 'ckan-connector-fixer: at least one argument must be passed' - echo "at leas one argument must be passed, init or update" - exit 1 -fi - -ARG=$1 -CK_WEB_DIR={{ smartgears_instance_path }}/webapps/ckan-connector/WEB-INF -CK_WEB_XML=$CK_WEB_DIR/.web.xml.tpl -CK_WEB_XML_TMP=$CK_WEB_DIR/.web.xml.tmp -CK_WEB_XML_DEST=$CK_WEB_DIR/web.xml -CK_DB_NAME={{ ckan_db_name }} -CK_DB_USER={{ ckan_db_user }} -CK_DB_HOST={{ psql_db_host }} -CK_ADMIN={{ ckan_connector_user }} -CK_ADMIN_PWD={{ ckan_connector_user_pwd }} -CK_INI=/etc/ckan/default/production.ini -API_KEY= -CKAN_KEY= -SQL_FILE=$( mktemp /tmp/XXXXXX.sql ) -CKAN_CREATE_USER={{ ckan_init_db_and_solr }} - -trap "logger 'ckan-connector-fixer: trap intercepted, exiting.' ; cleanup" SIGHUP SIGINT SIGTERM - -function cleanup() { - rm -f $SQL_FILE - rm -f $CK_WEB_XML_TMP -} - - -if [ -f $CK_WEB_DIR/.web.xml.configured ] ; then - if [ "$ARG" != "update" ] ; then - logger 'ckan-connector-fixer: service already configured, doing nothing.' - echo "service already configured. Use 'update' as argument to force the execution" - exit 0 - fi -fi - -{% raw %} - -# Set the CKAN python virtualenv -. /usr/lib/ckan/default/bin/activate -cd /usr/lib/ckan/default/src/ckan - -if [ "$CKAN_CREATE_USER" == "True" ] ; then -# Create the admin user - paster user -c $CK_INI add $CK_ADMIN password=$CK_ADMIN_PWD email=ckan_admin@d4science.org -fi -paster sysadmin -c $CK_INI add $CK_ADMIN - -# Get the admin key -echo "update \"user\" set state = 'active' where name = '${CK_ADMIN}';" > $SQL_FILE -echo "select apikey from \"user\" where name = '${CK_ADMIN}' and state = 'active';" >> $SQL_FILE -API_KEY=$( psql -t -n -q -h $CK_DB_HOST -U $CK_DB_USER -w $CK_DB_NAME -f $SQL_FILE ) - -[ $? -ne 0 ] && exit 1 - -CKAN_KEY=$( grep ^beaker\.session\.secret $CK_INI | awk '{ print $3 }' ) - -[ $? -ne 0 ] && exit 1 - -cp $CK_WEB_XML $CK_WEB_XML_TMP -# Use the admin key on the connector web.xml -if [ ! -z $API_KEY ] ; then - sed -i -e "s#@CKAN_API_KEY@#${API_KEY}#g" $CK_WEB_XML_TMP -else - exit 1 -fi - -# Use the ckan key on the connector web.xml -if [ ! -z $CKAN_KEY ] ; then - sed -i -e "s#@CKAN_SECRET@#${CKAN_KEY}#g" $CK_WEB_XML_TMP -else - exit 1 -fi - -{% endraw %} - -mv $CK_WEB_XML_TMP $CK_WEB_XML_DEST -chown {{ smartgears_user }}:{{ smartgears_user }} $CK_WEB_XML_DEST -chmod 440 $CK_WEB_XML_DEST - -touch $CK_WEB_DIR/.web.xml.configured - -trap cleanup EXIT -exit 0 - - - diff --git a/smartgears/ckan_connector/templates/ckan-web.xml.j2 b/smartgears/ckan_connector/templates/ckan-web.xml.j2 deleted file mode 100644 index 9df7ec36..00000000 --- a/smartgears/ckan_connector/templates/ckan-web.xml.j2 +++ /dev/null @@ -1,33 +0,0 @@ - - - secret - @CKAN_SECRET@ - - - hostIp - 0.0.0.0 - - - hostname - {% if hostname is defined %} - {{ hostname }} - {% else %} - {{ smartgears_hostname }} - {% endif %} - - - internalPort - {{ ckan_webapp_port }} - - - ckanKey - @CKAN_API_KEY@ - - - org.gcube.data.access.ckanconnector.CkanConnector - - - org.gcube.data.access.ckanconnector.CkanConnector - /* - - diff --git a/smartgears/cmems_importer_se_plugin/defaults/main.yml b/smartgears/cmems_importer_se_plugin/defaults/main.yml deleted file mode 100644 index ed20bff3..00000000 --- a/smartgears/cmems_importer_se_plugin/defaults/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -cmems_importer_se_plugin_install: False -cmems_importer_se_plugin_upgrade: False -cmems_importer_se_plugin_version: latest - -cmems_importer_se_plugin_group_id: 'org.gcube.dataanalysis' -cmems_importer_se_plugin_name: 'cmems-importer-se-plugin' -cmems_importer_se_plugin_extension: 'jar' -cmems_importer_se_plugin_classifier: 'uberjar' -cmems_importer_se_plugin_uber_file: '{{ cmems_importer_se_plugin_name }}-{{ cmems_importer_se_plugin_version }}-{{ cmems_importer_se_plugin_classifier }}.{{ cmems_importer_se_plugin_extension }}' -cmems_importer_se_plugin_file: '{{ cmems_importer_se_plugin_name }}-{{ cmems_importer_se_plugin_version }}.{{ cmems_importer_se_plugin_extension }}' - -catalina_apps_conf: - - { app_name: '{{ smart_executor_name }}', plugin_name: '{{ cmems_importer_se_plugin_name }}' } - -# Note: the deb package nco is required diff --git a/smartgears/cmems_importer_se_plugin/meta/main.yml b/smartgears/cmems_importer_se_plugin/meta/main.yml deleted file mode 100644 index a9cd9b8f..00000000 --- a/smartgears/cmems_importer_se_plugin/meta/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -dependencies: - - role: '../library/roles/smartgears/smart_executor' - - role: '../library/roles/smartgears/catalina-app-conf' - diff --git a/smartgears/cmems_importer_se_plugin/tasks/main.yml b/smartgears/cmems_importer_se_plugin/tasks/main.yml deleted file mode 100644 index 8b76dda3..00000000 --- a/smartgears/cmems_importer_se_plugin/tasks/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- block: - - name: Remove the cmems-importer smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ cmems_importer_se_plugin_name }} state=absent - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not cmems_importer_se_plugin_install - tags: [ 'smartgears', 'cmems_importer_se', 'tomcat' ] - - -- block: - - name: Download the cmems-importer plugin uber jar - maven_artifact: artifact_id={{ cmems_importer_se_plugin_name }} version={{ cmems_importer_se_plugin_version | default('latest') }} group_id={{ cmems_importer_se_plugin_group_id }} extension={{ cmems_importer_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ cmems_importer_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ cmems_importer_se_plugin_uber_file }} - register: cmems_importer_download - - - name: Remove the old cmems-importer smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ cmems_importer_se_plugin_name }} state=absent - when: cmems_importer_download is changed - notify: Restart smartgears - - - name: Create the plugin directory inside the smart executor - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ cmems_importer_se_plugin_name }} state=directory - register: cmems_importer_create_dir - - - name: Unarchive the cmems-importer uber jar to expose its libraries - unarchive: src={{ smartgears_downloads_dir }}/{{ cmems_importer_se_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ cmems_importer_se_plugin_name }}/ copy=no - when: cmems_importer_create_dir is changed - notify: Restart smartgears - - - name: Download the cmems-importer plugin jar file - maven_artifact: artifact_id={{ cmems_importer_se_plugin_name }} version={{ cmems_importer_se_plugin_version }} group_id={{ cmems_importer_se_plugin_group_id }} extension={{ cmems_importer_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ cmems_importer_se_plugin_name }} keep_name=yes - notify: Restart smartgears - - - name: Remove the cmems-importer uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ cmems_importer_se_plugin_name }}/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - - name: Install the nco package - become_user: root - apt: pkg=nco state=present update_cache=yes cache_valid_time=1800 - - become: True - become_user: '{{ smartgears_user }}' - when: cmems_importer_se_plugin_install - tags: [ 'smartgears', 'cmems_importer_se', 'tomcat' ] diff --git a/smartgears/cmems_importer_se_plugin/vars/main.yml b/smartgears/cmems_importer_se_plugin/vars/main.yml deleted file mode 100644 index 08e8192c..00000000 --- a/smartgears/cmems_importer_se_plugin/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -smart_executor_install: True - diff --git a/smartgears/dataminer-service/meta/main.yml b/smartgears/dataminer-service/meta/main.yml deleted file mode 100644 index 393590a3..00000000 --- a/smartgears/dataminer-service/meta/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -dependencies: - - { role: ../../library/roles/smartgears/smartgears-service } - - { role: ../../library/roles/smartgears/dataminer_app } - - { role: ../../library/roles/conda, when: dataminer_conda_install } - - { role: ../../library/roles/hdf5, when: dataminer_hdf5 } - - { role: ../../library/roles/python3-env, when: py3_env_install } - - { role: ../../library/roles/pandoc } - - { role: ../../library/roles/octave, when: octave_install } - - { role: ../../library/roles/ubuntugis, when: ubuntugis_repo_install } - - { role: ../../library/roles/R, when: r_install } diff --git a/smartgears/dataminer_algorithms_crawler_plugin/defaults/main.yml b/smartgears/dataminer_algorithms_crawler_plugin/defaults/main.yml deleted file mode 100644 index d5704e4d..00000000 --- a/smartgears/dataminer_algorithms_crawler_plugin/defaults/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -dataminer_crawler_plugin_install: False -dataminer_crawler_plugin_name: DataMinerAlgorithmsCrawler - -dataminer_crawler_plugin_group_id : org.gcube.data-publishing.gCat-Feeder -dataminer_crawler_plugin_artifact_id : '{{ dataminer_crawler_plugin_plugin_name }}' -dataminer_crawler_plugin_version : latest -dataminer_crawler_plugin_extension: jar -dataminer_crawler_plugin_classifier: uberjar -dataminer_crawler_plugin_uber_file: '{{ dataminer_crawler_plugin_name }}-{{ dataminer_crawler_plugin_version }}-{{ dataminer_crawler_plugin_classifier }}.{{ dataminer_crawler_plugin_extension }}' -dataminer_crawler_plugin_plugin_file: '{{ dataminer_crawler_plugin_name }}-{{ dataminer_crawler_plugin_version }}.{{ dataminer_crawler_plugin_extension }}' - -catalina_apps_conf: - - { app_name: '{{ gfeed_service_name }}', plugin_name: '{{ dataminer_crawler_plugin_plugin_name }}' } diff --git a/smartgears/dataminer_algorithms_crawler_plugin/meta/main.yml b/smartgears/dataminer_algorithms_crawler_plugin/meta/main.yml deleted file mode 100644 index 2510b86d..00000000 --- a/smartgears/dataminer_algorithms_crawler_plugin/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: '../library/roles/smartgears/catalina-app-conf' - diff --git a/smartgears/dataminer_algorithms_crawler_plugin/tasks/main.yml b/smartgears/dataminer_algorithms_crawler_plugin/tasks/main.yml deleted file mode 100644 index e88c97bd..00000000 --- a/smartgears/dataminer_algorithms_crawler_plugin/tasks/main.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- block: - - name: Remove the old dataminer crawler gfeed plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ dataminer_crawler_plugin_plugin_name }} state=absent - - become: True - become_user: '{{ smartgears_user }}' - when: not dataminer_crawler_plugin_install - tags: [ 'dataminer_crawler', 'gfeed_service' ] - -- block: - - name: Get the dataminer crawler gfeed uber jar - maven_artifact: artifact_id={{ dataminer_crawler_plugin_name }} version={{ dataminer_crawler_plugin_version }} group_id={{ dataminer_crawler_plugin_group_id }} extension={{ dataminer_crawler_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ dataminer_crawler_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ dataminer_crawler_plugin_uber_file }} verify_checksum=always - register: dataminer_crawler_download - - - name: Remove the old dataminer crawler gfeed plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ dataminer_crawler_plugin_name }} state=absent - when: dataminer_crawler_download is changed - - - name: Create the plugin directory inside gfeed - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ dataminer_crawler_plugin_name }} state=directory - register: dataminer_crawler_create_dir - - - name: Unarchive the dataminer crawler gfeed uber jar to expose its libraries - unarchive: src={{ smartgears_downloads_dir }}/{{ dataminer_crawler_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ dataminer_crawler_plugin_name }}/ copy=no - when: dataminer_crawler_create_dir is changed - notify: Restart smartgears - - - name: Get the dataminer crawler gfeed jar - maven_artifact: artifact_id={{ dataminer_crawler_plugin_name }} version={{ dataminer_crawler_plugin_version }} group_id={{ dataminer_crawler_plugin_group_id }} extension={{ dataminer_crawler_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ dataminer_crawler_plugin_name }} keep_name=yes - notify: Restart smartgears - - - name: Remove the dataminer crawler uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ dataminer_crawler_plugin_name }}/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: dataminer_crawler_plugin_install - tags: [ 'dataminer_crawler', 'gfeed_service' ] - diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml deleted file mode 100644 index dd30e066..00000000 --- a/smartgears/dataminer_app/defaults/main.yml +++ /dev/null @@ -1,63 +0,0 @@ ---- -dataminer_app_install: False -dataminer_app_upgrade: False -dataminer_algorithms_installer: True -dataminer_algorithms_updater: True - -# ZIP file -dataminer_product: prod -dataminer_zip_url: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/webapp/{{ dataminer_product }}/wps.zip' - -# Install from WAR -dataminer_wps_version: latest -smartgears_webapp_name: wps -dataminer_wps_name: '{{ smartgears_webapp_name }}' -dataminer_wps_group_id: org.gcube.data-analysis -dataminer_wps_extension: war -dataminer_wps_file: '{{ dataminer_wps_name }}-{{ dataminer_wps_version }}.{{ dataminer_wps_extension }}' - -# Add these to the tomcat_m_other_java_opts variable -dataminer_wps_java_opts: '-Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl -Djavax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl' -# Algorithms installer -dataminer_algorithms_upgrade: False -dataminer_algorithms_version: latest -dataminer_algorithms_gcube_repository: gcube-snapshots -dataminer_algorithms_name: dataminer-algorithms-importer -dataminer_algorithms_group_id: org.gcube.dataanalysis -dataminer_algorithms_extension: tar.gz -dataminer_algorithms_file: '{{ dataminer_algorithms_name }}-{{ dataminer_algorithms_version }}.{{ dataminer_algorithms_extension }}' -dataminer_algorithms_base_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ dataminer_algorithms_gcube_repository }}' -# Algorithms updater -dataminer_wps_algorithms_svn: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/{{ dataminer_infra_reference }} -dataminer_wps_algorithms_dest: '{{ smartgears_user_home }}/wps_algorithms/algorithms' -dataminer_algorithms_updater_cron: present -dataminer_algorithms_updater_minute_frequency: "0" -dataminer_algorithms_updater_hour_frequency: "*" - -dataminer_download_gebco_file: True -dataminer_data_file_from_thredds: 'http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc' - -dataminer_conda_install: False -dataminer_hdf5: False -dataminer_install_nscd: False - -# web.xml properties -dataminer_maxcomputation: "4" -dataminer_saveonstorage: 'true' -dataminer_simulationmode: 'false' -dataminer_webxml_users_excluded: 'statistical.manager,nlphubberd4science' - -# dev, prod, preprod -dataminer_infra_reference: dev - -dataminer_properties_files: - - algorithms.properties - - clusterers.properties - - dynamictransducerers.properties - - evaluators.properties - - generators.properties - - modelers.properties - - models.properties - - nodealgorithms.properties - - transducerers.properties - - userperspective.properties diff --git a/smartgears/dataminer_app/files/algorithms.properties b/smartgears/dataminer_app/files/algorithms.properties deleted file mode 100644 index 48263ebc..00000000 --- a/smartgears/dataminer_app/files/algorithms.properties +++ /dev/null @@ -1,17 +0,0 @@ -AQUAMAPS_SUITABLE=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsSuitable -AQUAMAPS_NATIVE=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsNative -AQUAMAPS_NATIVE_2050=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsNative2050 -AQUAMAPS_SUITABLE_2050=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsSuitable2050 -AQUAMAPS_NATIVE_NEURALNETWORK=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsNN -AQUAMAPS_SUITABLE_NEURALNETWORK=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsNNSuitable -FEED_FORWARD_A_N_N_DISTRIBUTION=org.gcube.dataanalysis.ecoengine.spatialdistributions.FeedForwardNeuralNetworkDistribution -LWR=org.gcube.dataanalysis.executor.nodes.algorithms.LWR -BIONYM_BIODIV=org.gcube.dataanalysis.executor.nodes.transducers.bionym.BionymBiodiv -BIONYM=org.gcube.dataanalysis.executor.nodes.transducers.bionym.BionymFlexibleWorkflowTransducer -OCCURRENCES_MERGER=org.gcube.dataanalysis.executor.nodes.transducers.OccurrenceMergingNode -OCCURRENCES_INTERSECTOR=org.gcube.dataanalysis.executor.nodes.transducers.OccurrenceIntersectionNode -OCCURRENCES_SUBTRACTION=org.gcube.dataanalysis.executor.nodes.transducers.OccurrenceSubtractionNode -CMSY=org.gcube.dataanalysis.executor.nodes.algorithms.CMSY -FAOMSY=org.gcube.dataanalysis.executor.nodes.algorithms.FAOMSY -ICCAT_VPA=org.gcube.dataanalysis.executor.nodes.algorithms.ICCATVPA -FEED_FORWARD_NEURAL_NETWORK_CLOUD_REGRESSOR=org.gcube.data.analysis.algorithms.neuralnetworks.feedforward.FeedForwardNeuralNetworkCloudRegressor \ No newline at end of file diff --git a/smartgears/dataminer_app/files/clusterers.properties b/smartgears/dataminer_app/files/clusterers.properties deleted file mode 100644 index f9321de4..00000000 --- a/smartgears/dataminer_app/files/clusterers.properties +++ /dev/null @@ -1,4 +0,0 @@ -DBSCAN=org.gcube.dataanalysis.ecoengine.clustering.DBScan -LOF=org.gcube.dataanalysis.ecoengine.clustering.LOF -KMEANS=org.gcube.dataanalysis.ecoengine.clustering.KMeans -XMEANS=org.gcube.dataanalysis.ecoengine.clustering.XMeansWrapper \ No newline at end of file diff --git a/smartgears/dataminer_app/files/dynamictransducerers.properties b/smartgears/dataminer_app/files/dynamictransducerers.properties deleted file mode 100644 index aec7a718..00000000 --- a/smartgears/dataminer_app/files/dynamictransducerers.properties +++ /dev/null @@ -1 +0,0 @@ -#org.gcube.dataanalysis.geo.wps.factory.DynamicWPSTransducerer \ No newline at end of file diff --git a/smartgears/dataminer_app/files/evaluators.properties b/smartgears/dataminer_app/files/evaluators.properties deleted file mode 100644 index 3f438a8a..00000000 --- a/smartgears/dataminer_app/files/evaluators.properties +++ /dev/null @@ -1,4 +0,0 @@ -MAPS_COMPARISON=org.gcube.dataanalysis.geo.algorithms.MapsComparator -DISCREPANCY_ANALYSIS=org.gcube.dataanalysis.ecoengine.evaluation.DiscrepancyAnalysis -QUALITY_ANALYSIS=org.gcube.dataanalysis.ecoengine.evaluation.DistributionQualityAnalysis -HRS=org.gcube.dataanalysis.ecoengine.evaluation.HabitatRepresentativeness \ No newline at end of file diff --git a/smartgears/dataminer_app/files/generators.properties b/smartgears/dataminer_app/files/generators.properties deleted file mode 100644 index 29071626..00000000 --- a/smartgears/dataminer_app/files/generators.properties +++ /dev/null @@ -1,3 +0,0 @@ -LOCAL_WITH_DATABASE=org.gcube.dataanalysis.ecoengine.processing.LocalSplitGenerator -SIMPLE_LOCAL=org.gcube.dataanalysis.ecoengine.processing.LocalSimpleSplitGenerator -D4SCIENCE=org.gcube.dataanalysis.executor.generators.D4ScienceDistributedProcessing \ No newline at end of file diff --git a/smartgears/dataminer_app/files/modelers.properties b/smartgears/dataminer_app/files/modelers.properties deleted file mode 100644 index d5c652e1..00000000 --- a/smartgears/dataminer_app/files/modelers.properties +++ /dev/null @@ -1 +0,0 @@ -HSPEN_MODELER=org.gcube.dataanalysis.ecoengine.modeling.SimpleModeler \ No newline at end of file diff --git a/smartgears/dataminer_app/files/models.properties b/smartgears/dataminer_app/files/models.properties deleted file mode 100644 index b19d44c7..00000000 --- a/smartgears/dataminer_app/files/models.properties +++ /dev/null @@ -1,3 +0,0 @@ -HSPEN=org.gcube.dataanalysis.ecoengine.models.ModelHSPEN -AQUAMAPSNN=org.gcube.dataanalysis.ecoengine.models.ModelAquamapsNN -FEED_FORWARD_ANN=org.gcube.dataanalysis.ecoengine.models.FeedForwardNN \ No newline at end of file diff --git a/smartgears/dataminer_app/files/nodealgorithms.properties b/smartgears/dataminer_app/files/nodealgorithms.properties deleted file mode 100644 index 2e83be13..00000000 --- a/smartgears/dataminer_app/files/nodealgorithms.properties +++ /dev/null @@ -1,16 +0,0 @@ -AQUAMAPS_SUITABLE=org.gcube.dataanalysis.executor.nodes.algorithms.AquamapsSuitableNode -AQUAMAPS_NATIVE=org.gcube.dataanalysis.executor.nodes.algorithms.AquamapsNativeNode -AQUAMAPS_NATIVE_2050=org.gcube.dataanalysis.executor.nodes.algorithms.AquamapsNative2050Node -AQUAMAPS_SUITABLE_2050=org.gcube.dataanalysis.executor.nodes.algorithms.AquamapsSuitable2050Node -OCCURRENCES_MERGER=org.gcube.dataanalysis.executor.nodes.transducers.OccurrenceMergingNode -OCCURRENCES_INTERSECTOR=org.gcube.dataanalysis.executor.nodes.transducers.OccurrenceIntersectionNode -OCCURRENCES_SUBTRACTION=org.gcube.dataanalysis.executor.nodes.transducers.OccurrenceSubtractionNode -LWR=org.gcube.dataanalysis.executor.nodes.algorithms.LWR -BIONYM_BIODIV=org.gcube.dataanalysis.executor.nodes.transducers.bionym.BionymBiodiv -BIONYM=org.gcube.dataanalysis.executor.nodes.transducers.bionym.BionymFlexibleWorkflowTransducer -CMSY=org.gcube.dataanalysis.executor.nodes.algorithms.CMSY -FAOMSY=org.gcube.dataanalysis.executor.nodes.algorithms.FAOMSY -ICCAT_VPA=org.gcube.dataanalysis.executor.nodes.algorithms.ICCATVPA -FEED_FORWARD_NEURAL_NETWORK_CLOUD_REGRESSOR=org.gcube.data.analysis.algorithms.neuralnetworks.feedforward.FeedForwardNeuralNetworkCloudRegressor -AQUAMAPS_NATIVE_NEURALNETWORK=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsNN -AQUAMAPS_SUITABLE_NEURALNETWORK=org.gcube.dataanalysis.ecoengine.spatialdistributions.AquamapsNNSuitable diff --git a/smartgears/dataminer_app/files/transducerers.properties b/smartgears/dataminer_app/files/transducerers.properties deleted file mode 100644 index b18cae39..00000000 --- a/smartgears/dataminer_app/files/transducerers.properties +++ /dev/null @@ -1,185 +0,0 @@ -HCAF_FILTER=org.gcube.dataanalysis.ecoengine.transducers.simplequeryexecutors.HcafFilter -ABSENCE_CELLS_FROM_AQUAMAPS=org.gcube.dataanalysis.ecoengine.transducers.simplequeryexecutors.MarineAbsencePointsFromAquamapsDistribution -BIOCLIMATE_HCAF=org.gcube.dataanalysis.ecoengine.transducers.BioClimateHCAFTransducer -BIOCLIMATE_HSPEC=org.gcube.dataanalysis.ecoengine.transducers.BioClimateHSPECTransducer -BIOCLIMATE_HSPEN=org.gcube.dataanalysis.ecoengine.transducers.BioClimateHSPENTransducer -BIONYM_LOCAL=org.gcube.dataanalysis.executor.nodes.transducers.bionym.BionymLocalTransducer -OCCURRENCES_DUPLICATES_DELETER=org.gcube.dataanalysis.ecoengine.transducers.OccurrencePointsDuplicatesDeleter -OCCURRENCES_MARINE_TERRESTRIAL=org.gcube.dataanalysis.ecoengine.transducers.OccurrencePointsInSeaOnEarth -HCAF_INTERPOLATION=org.gcube.dataanalysis.ecoengine.transducers.InterpolationTransducer -PRESENCE_CELLS_GENERATION=org.gcube.dataanalysis.ecoengine.transducers.simplequeryexecutors.MarinePresencePoints -MOST_OBSERVED_SPECIES=org.gcube.dataanalysis.trendylyzeralgorithms.AbsoluteSpeciesBarChartsAlgorithm -MOST_OBSERVED_TAXA=org.gcube.dataanalysis.trendylyzeralgorithms.TaxaObservationsBarChartAlgorithm -SPECIES_OBSERVATIONS_PER_AREA=org.gcube.dataanalysis.trendylyzeralgorithms.SpeciesObservationsAreaBarChart -SPECIES_OBSERVATIONS_TREND_PER_YEAR=org.gcube.dataanalysis.trendylyzeralgorithms.SpeciesObservationsPerYear -SPECIES_OBSERVATION_LME_AREA_PER_YEAR=org.gcube.dataanalysis.trendylyzeralgorithms.SpeciesObservationsPerLMEAreaPerYearLineChart -SPECIES_OBSERVATION_MEOW_AREA_PER_YEAR=org.gcube.dataanalysis.trendylyzeralgorithms.SpeciesObservationsPerMEOWAreaPerYearLineChart -TAXONOMY_OBSERVATIONS_TREND_PER_YEAR=org.gcube.dataanalysis.trendylyzeralgorithms.TaxaObservationsPerYearLineChart -GETTABLEDETAILS=org.gcube.dataaccess.algorithms.drmalgorithms.GetTableDetails -LISTDBINFO=org.gcube.dataaccess.algorithms.drmalgorithms.ListDBInfo -LISTDBNAMES=org.gcube.dataaccess.algorithms.drmalgorithms.ListNames -LISTDBSCHEMA=org.gcube.dataaccess.algorithms.drmalgorithms.ListSchemas -LISTTABLES=org.gcube.dataaccess.algorithms.drmalgorithms.ListTables -RANDOMSAMPLEONTABLE=org.gcube.dataaccess.algorithms.drmalgorithms.RandomSampleOnTable -SAMPLEONTABLE=org.gcube.dataaccess.algorithms.drmalgorithms.SampleOnTable -SMARTSAMPLEONTABLE=org.gcube.dataaccess.algorithms.drmalgorithms.SmartSampleOnTable -SUBMITQUERY=org.gcube.dataaccess.algorithms.drmalgorithms.SubmitQuery -XYEXTRACTOR=org.gcube.dataanalysis.geo.algorithms.XYExtraction -XYEXTRACTOR_TABLE=org.gcube.dataanalysis.geo.algorithms.XYExtractionTable -ZEXTRACTION=org.gcube.dataanalysis.geo.algorithms.ZExtraction -ZEXTRACTION_TABLE=org.gcube.dataanalysis.geo.algorithms.ZExtractionTable -TIMEEXTRACTION=org.gcube.dataanalysis.geo.algorithms.TimeExtraction -TIMEEXTRACTION_TABLE=org.gcube.dataanalysis.geo.algorithms.TimeExtractionTable -TIME_GEO_CHART=org.gcube.dataanalysis.geo.algorithms.TimeGeoChartProducer -TIME_SERIES_ANALYSIS=org.gcube.dataanalysis.ecoengine.transducers.TimeSeriesAnalysis -TIME_SERIES_CHARTS=org.gcube.dataanalysis.ecoengine.transducers.charts.TimeSeriesChartsTransducerer -KNITR_COMPILER=org.gcube.dataanalysis.executor.rscripts.KnitrCompiler -SGVM_INTERPOLATION=org.gcube.dataanalysis.executor.rscripts.SGVMS_Interpolation -MAX_ENT_NICHE_MODELLING=org.gcube.dataanalysis.geo.algorithms.MaxEnt4NicheModellingTransducer -SEADATANET_INTERPOLATOR=org.gcube.dataanalysis.seadatanet.SeaDataNetConnector -RASTER_DATA_PUBLISHER=org.gcube.dataanalysis.geo.algorithms.RasterDataPublisher -GEO_CHART=org.gcube.dataanalysis.geo.algorithms.StaticGeoChartProducer -ESRI_GRID_EXTRACTION=org.gcube.dataanalysis.geo.algorithms.ESRIGRIDExtraction -OCCURRENCE_ENRICHMENT=org.gcube.dataanalysis.geo.algorithms.OccurrenceEnrichment -POLYGONS_TO_MAP=org.gcube.dataanalysis.geo.algorithms.PolygonMapsCreator -SPECIES_MAP_FROM_CSQUARES=org.gcube.dataanalysis.geo.algorithms.SpeciesDistributionsMapsCreatorFromCsquares -SPECIES_MAP_FROM_POINTS=org.gcube.dataanalysis.geo.algorithms.SpeciesDistributionsMapsCreatorFromPoints -GENERIC_CHARTS=org.gcube.dataanalysis.ecoengine.transducers.charts.QuantitiesAttributesChartsTransducerer -POINTS_TO_MAP=org.gcube.dataanalysis.geo.algorithms.PointsMapsCreator -CSQUARES_TO_COORDINATES=org.gcube.dataanalysis.geo.vti.CSquare2Coordinates -CSQUARE_COLUMN_CREATOR=org.gcube.dataanalysis.geo.algorithms.CSquaresCreator -FAO_OCEAN_AREA_COLUMN_CREATOR=org.gcube.dataanalysis.geo.algorithms.FAOOceanAreaCreator -FAO_OCEAN_AREA_COLUMN_CREATOR_FROM_QUADRANT=org.gcube.dataanalysis.geo.algorithms.FAOOceanAreaCreatorQuadrant -GRID_CWP_TO_COORDINATES=org.gcube.dataanalysis.geo.vti.GridCWP2Coordinates -EGIP_ENERGY_AGGREGATED_DISTRIBUTION=org.gcube.dataanalysis.geothermal.EnergyHistogramAggregated -EGIP_ENERGY_COUNTRY_DISTRIBUTION=org.gcube.dataanalysis.geothermal.EnergyHistogramPerCountry -EGIP_ENERGY_TRENDS=org.gcube.dataanalysis.geothermal.EnergyTrends -EGIP_ENERGY_YEAR_DISTRIBUTION=org.gcube.dataanalysis.geothermal.EnergyHistogramPerYear -ESTIMATE_FISHING_ACTIVITY=org.gcube.dataanalysis.geo.vti.EstimateFishingActivity -ESTIMATE_MONTHLY_FISHING_EFFORT=org.gcube.dataanalysis.geo.vti.EstimateMonthlyFishingEffort -WEB_APP_PUBLISHER=org.gcube.dataanalysis.executor.nodes.transducers.WebApplicationPublisher -SHAPEFILE_PUBLISHER=org.gcube.dataanalysis.geo.algorithms.ShapefilePublisher -GENERIC_WORKER=org.gcube.dataanalysis.executor.job.management.GenericWorker -ABSENCE_GENERATION_FROM_OBIS=org.gcube.dataanalysis.executor.rscripts.AbsencegenerationfromOBIS -ECOPATH_WITH_ECOSIM=org.gcube.dataanalysis.ewe.SimpleEwE -ENSEMBLE_MODEL=org.gcube.dataanalysis.ensemble.EnsembleAlgorithm -ICHTHYOP_MODEL_ONE_BY_ONE=org.gcube.dataanalysis.executor.rscripts.Ichthyopmodelonebyone -STEP_3___VPA_ICCAT_BFT_E_PROJECTION=org.gcube.dataanalysis.executor.rscripts.STEP3VPAICCATBFTEProjection -CCAMLR_EXPORTER_TOOL=org.gcube.dataanalysis.executor.rscripts.CCAMLRExporterTool -STEP_2__VPA_ICCAT_BFT_E_VISUALISATION=org.gcube.dataanalysis.executor.rscripts.STEP2VPAICCATBFTEVISUALISATION -ICHTHYOP_MODEL_MULTIPLE_RUNS=org.gcube.dataanalysis.executor.rscripts.Ichthyopmodelmultipleruns -PARALLELIZED_STEP1_VPA_ICCAT_BFT_E_RETROS=org.gcube.dataanalysis.executor.rscripts.parallelizedSTEP1VPAICCATBFTERetros -STEP_4_VPA_ICCAT_BFT_E_REPORT=org.gcube.dataanalysis.executor.rscripts.Step4VpaIccatBftEReport -TUNA_ATLAS_DATA_ACCESS=org.gcube.dataanalysis.executor.rscripts.TunaAtlasDataAccess -FIGIS_SPATIAL_REALLOCATION_SIMPLIFIED=org.fao.fi.dataanalysis.spread.SpatialReallocationSimplifiedAlgorithm -FIGIS_SPATIAL_REALLOCATION_GENERIC=org.fao.fi.dataanalysis.spread.SpatialReallocationGenericAlgorithm -FIGIS_SPATIAL_REALLOCATION_SIMPLIFIED_TABLE=org.fao.fi.dataanalysis.spread.SpatialReallocationSimplifiedTableAlgorithm -FIGIS_SDMX_DATA_CONVERTER=org.fao.fi.dataanalysis.stats.SDMXDataConverter -CATCHES_BY_SPECIES=org.gcube.dataanalysis.executor.rscripts.Catchesbyspecies -CATCHES_BY_FLAGS=org.gcube.dataanalysis.executor.rscripts.Catchesbyflags -MAKE_ICHTHYOP_NETCDF_CF_COMPLIANT=org.gcube.dataanalysis.executor.rscripts.MakeichthyopnetCDFCFcompliant -ICHTHYOP_NETCDF_OUTPUT_TO_SHAPEFILE=org.gcube.dataanalysis.executor.rscripts.IchthyopnetCDFoutputtoshapefile -GENETICALGORITHM=org.gcube.dataanalysis.executor.rscripts.GeneticAlgorithm -GLOBAL_CATCHES=org.gcube.dataanalysis.executor.rscripts.Globalcatches -MPA_INTERSECT_V2=org.gcube.dataanalysis.executor.rscripts.MPAIntersectv2 -QUICK_RANK_TRAIN=it.cnr.isti.hpc.quickrank.qrtrain.QuickRankTrain -QUICK_RANK_TRAIN_NO_VALIDATION=it.cnr.isti.hpc.quickrank.qrtrainnovalid.QuickRankTrainNoValidation -QUICK_RANK_TEST=it.cnr.isti.hpc.quickrank.qrtest.QuickRankTest -STAT_VAL=org.gcube.dataanalysis.executor.rscripts.statval -TUNA_ATLAS_INDICATOR_1__SPECIES_BY_OCEAN_=org.gcube.dataanalysis.executor.rscripts.TunaAtlasIndicator1SpeciesByOcean -SIMULFISHKPIS=org.gcube.dataanalysis.executor.rscripts.SimulFishKPIs -READWFS=org.gcube.dataanalysis.executor.rscripts.ReadWFS -PROJECTIONS_REPORT_VPA_ICCAT_BFT_E=org.gcube.dataanalysis.executor.rscripts.ProjectionsreportVPAICCATBFTE -WHOLE_STEPS_VPA_ICCAT_BFT_E=org.gcube.dataanalysis.executor.rscripts.WholeStepsVPAICCATBFTE -CATCHES_BY_TYPE_OF_SCHOOL=org.gcube.dataanalysis.executor.rscripts.Catchesbytypeofschool -CATCHES_BY_GEAR_SIMPLIFIED_VERSION=org.gcube.dataanalysis.executor.rscripts.Catchesbygearsimplifiedversion -CATCHES_BY_FLAGS_SIMPLIFIED_VERSION=org.gcube.dataanalysis.executor.rscripts.Catchesbyflagssimplifiedversion -CATCHES_BY_SPECIES_SIMPLIFIED_VERSION=org.gcube.dataanalysis.executor.rscripts.Catchesbyspeciessimplifiedversion -CATCHES_BY_GEARS=org.gcube.dataanalysis.executor.rscripts.Catchesbygears -COMPUTE_FISHERIES_INDICATORS_FROM_OWN_FORMATTED_DATASET=org.gcube.dataanalysis.executor.rscripts.Computefisheriesindicatorsfromownformatteddataset -IMPORT_FISHERIES_FORMATTED_DATASET___QUICK_IMPORT=org.gcube.dataanalysis.executor.rscripts.ImportFisheriesFormattedDatasetQuickimport -CATCHES_AGGREGATED_FOLLOWING_A_SELECT_VARIABLE=org.gcube.dataanalysis.executor.rscripts.Catchesaggregatedfollowingaselectvariable -WTG=org.gcube.dataanalysis.executor.rscripts.WTG -FEED_FORWARD_NEURAL_NETWORK_TRAINER=org.gcube.data.analysis.algorithms.neuralnetworks.feedforward.FeedForwardNeuralNetworkTrainer -NCOUTPUTS2CSV_VPA_ICCAT_BFT_E=org.gcube.dataanalysis.executor.rscripts.ncOutputs2csvVPAICCATBFTE -FEED_FORWARD_NEURAL_NETWORK_REGRESSOR=org.gcube.data.analysis.algorithms.neuralnetworks.feedforward.FeedForwardNeuralNetworkRegressor -CMSY_2=org.gcube.dataanalysis.executor.rscripts.CMSY2 -CATCHES_INDICATORS_IOTC_REST_SERVICES=org.gcube.dataanalysis.executor.rscripts.catchesindicatorsiotcrestservices -STAT_VAL_UNIPARTITE_NET=org.gcube.dataanalysis.executor.rscripts.STATVALUNIPARTITENET -GEOGRSF_INTERSECTS=org.gcube.dataanalysis.executor.rscripts.GeoGRSFIntersects -TESTING_ALGORITHM=org.gcube.dataanalysis.executor.rscripts.TestingAlgorithm -SPATIAL_DISTRIBUTION_OF_CORRELATION=org.gcube.dataanalysis.executor.rscripts.SPATIALDISTRIBUTIONOFCORRELATION -KAPPA_COEFFICIENT=org.gcube.data.analysis.algorithms.kstatistics.KStatistics -TRANSFORM_IOTC_CATCH_AND_EFFORT_DSD_CECOASTAL_AND_CESURFACE=org.gcube.dataanalysis.executor.rscripts.TransformIOTCCatchandeffortDSDCECoastalandCESurface -LOAD_CATCHES_DATASET_IN_SARDARA=org.gcube.dataanalysis.executor.rscripts.Loadcatchesdatasetinsardara -LOAD_EFFORTS_DATASET_IN_SARDARA=org.gcube.dataanalysis.executor.rscripts.Loadeffortsdatasetinsardara -SCATTERPLOT_DIAGRAM=org.gcube.dataanalysis.executor.rscripts.SCATTERPLOTDIAGRAM -SPATIAL_DENSITY_DISTRIBUTION=org.gcube.dataanalysis.executor.rscripts.SPATIALDENSITYDISTRIBUTION -GEOGRSF_BBOXLIST=org.gcube.dataanalysis.executor.rscripts.GeoGRSFBboxlist -SHAPEFILE_IMPORTER=org.gcube.data.analysis.algorithms.shapefileimporter.ShapefileImporter -MATLAS_OPTICS_CLUSTERING=it.cnr.isti.kdd.matlas.optics.Optics -MATLAS_TRAJECTORY_BUILDER=it.cnr.isti.kdd.matlas.trajectoryBuilder.TrajectoryBuilder -ENGLISH_NAMED_ENTITY_RECOGNIZER=org.gcube.data.analysis.algorithms.samplepipeline.SamplePipeline -TWITTER_MONITOR=it.cnr.iit.wafi.gcube.twmon.sched.TwMonScheduler -ENGLISH_NAMED_ENTITY_RECOGNIZER_FOR_TWEETS=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline01 -ENGLISH_NAMED_ENTITY_RECOGNIZER=org.gcube.data.analysis.algorithms.samplepipeline.AbstractPipeline -GERMAN_NAMED_ENTITY_RECOGNIZER=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline02 -LANGUAGE_IDENTIFICATION_FOR_TWEETS=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline03 -ENGLISH_TWEET_TOKENIZER=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline04 -FRENCH_NAMED_ENTITY_RECOGNIZER=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline05 -PART_OF_SPEECH_TAGGER_FOR_TWEETS=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline06 -CYMRIE_WELSH_NAMED_ENTITY_RECOGNIZER=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline07 -FRENCH_NAMED_ENTITY_RECOGNIZER_FOR_TWEETS=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline08 -GERMAN_NAMED_ENTITY_RECOGNIZER_FOR_TWEETS=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline09 -ENGLISH_PART_OF_SPEECH_AND_MORPHOLOGY_ANAYLIZER=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline10 -NOUN_PHRASE_CHUNKER=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline11 -MEASUREMENT_EXPRESSION_ANNOTATOR=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline12 -ANNIE_PLUS_MEASUREMENTS=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline13 -GENERIC_OPINION_MINING_ENGLISH=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline14 -DECARBONET_ENVIRONMENTAL_ANNOTATOR=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline15 -DECARBONET_GERMAN_ENVIRONMENTAL_ANNOTATOR=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline16 -TWITTER_OPINION_MINING_ENGLISH=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline17 -THE_BREXIT_ANALYZER_PIPELINE=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline18 -SUMMA_TEXT_SUMMARIZATION_EN=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline19 -SUMMA_TEXT_SUMMARIZATION_ES=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline20 -OPEN_NLP_ENGLISH_PIPELINE=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline21 -OPEN_NLP_GERMAN_PIPELINE=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline22 -OPEN_NLP_DUTCH_PIPELINE=org.gcube.data.analysis.algorithms.samplepipeline.Pipeline23 -SMOOTH_SCATTERPLOT_DIAGRAM=org.gcube.dataanalysis.executor.rscripts.SMOOTHSCATTERPLOTDIAGRAM -ENRICHMENT_FROM_NETCDF=org.gcube.dataanalysis.executor.rscripts.EnrichmentFromNetcdf -CREATE_YOUR_OWN_VERSION_OF_THE_TUNA_ATLAS=org.gcube.dataanalysis.executor.rscripts.CreateyourownversionoftheTunaAtlas -LOAD_A_DATASET_IN_SARDARA_DATABASE=org.gcube.dataanalysis.executor.rscripts.LoadadatasetinSardaraDatabase -SAMPLE_KNIME_WORKFLOW=org.gcube.dataanalysis.executor.rscripts.SampleKnimeWorkflow -KNIME_WORKSPACE_FILE_UPLOADER=org.gcube.dataanalysis.executor.rscripts.KnimeWorkspaceFileUploader -MAXANDSAM_NETWORK_RECONTRUCTION_METHOD=org.gcube.dataanalysis.executor.rscripts.MaxAndSamNetworkRecontructionMethod -DEBTRANK_SYSTEMIC_RISK_ESTIMATION=org.gcube.dataanalysis.executor.rscripts.DebtRankSystemicRiskEstimation -TRANSFORM_CCSBT_TASK2_LONGLINE=org.gcube.dataanalysis.executor.rscripts.TransformCCSBTtask2Longline -PROJECT_SIMULFISHKPIS_DEV=org.gcube.dataanalysis.executor.rscripts.ProjectSimulFishKPIsDEV -AAPS_STAGING_PUBLISHER=org.gcube.dataanalysis.executor.rscripts.AAPSstagingpublisher -STEP_1___VPA_ICCAT_BFT_E_RETROS_ONERUN=org.gcube.dataanalysis.executor.rscripts.STEP1VPAICCATBFTERetrosOneRun -R_SAMPLE=org.gcube.dataanalysis.executor.rscripts.RSAMPLE -STANBOL_WRAPPER=org.gcube.data.analysis.algorithms.stanbolwrapper.StanbolWrapper -AAPS_NASO_PUBLISHER=org.gcube.dataanalysis.executor.rscripts.AAPSnasopublisher -GEOGRAPHIC_PROXIMITY_TOOL=org.gcube.dataanalysis.executor.rscripts.GeographicProximityTool -SCUBE=it.di.unipi.kdd.segregation.scube.SCubeGui -GEOGRSF_INTERSECTS_BATCH=org.gcube.dataanalysis.executor.rscripts.GeoGRSFIntersectsBatch -CSV_TO_NETCDF_CONVERTER_XY=org.gcube.data.analysis.algorithms.csvtonetcdfconverter.CsvToNetcdfConverterWrapperXY -CSV_TO_NETCDF_CONVERTER_XYZ=org.gcube.data.analysis.algorithms.csvtonetcdfconverter.CsvToNetcdfConverterWrapperXYZ -CSV_TO_NETCDF_CONVERTER_XYT=org.gcube.data.analysis.algorithms.csvtonetcdfconverter.CsvToNetcdfConverterWrapperXYT -CSV_TO_NETCDF_CONVERTER_XYZT=org.gcube.data.analysis.algorithms.csvtonetcdfconverter.CsvToNetcdfConverterWrapperXYZT -STEP_1___VPA_ICCAT_BFT_E_RETROS=org.gcube.dataanalysis.executor.rscripts.STEP1VPAICCATBFTERETROS -AAPS_PUBLIC_PUBLISHER=org.gcube.dataanalysis.executor.rscripts.AAPSpublicpublisher -SIMULFISHKPIS_PRE=org.gcube.dataanalysis.executor.rscripts.SIMULFISHKPISPRE -CSV_TO_NETCDF_CONVERTER_DIMCHAR=org.gcube.data.analysis.algorithms.csvtonetcdfconverter.CsvToNetcdfConverterWrapperDimChar -MPASINTERSECTIONANALYSIS=org.gcube.dataanalysis.executor.rscripts.MPAsIntersectionAnalysis -VSURF=org.gcube.dataanalysis.executor.rscripts.VSURF -TRAIN=org.gcube.dataanalysis.executor.rscripts.train -MPA_INTERSECT_V3=org.gcube.dataanalysis.executor.rscripts.MpaIntersectV3 -SUPPORT_VECTOR_MACHINE_TRAINER=org.gcube.data.analysis.algorithms.supportvectormachine.SupportVectorMachine -MPA_INTERSECT_V3_2=org.gcube.dataanalysis.executor.rscripts.MpaIntersectV32 -SUPPORT_VECTOR_MACHINE_TRAINER=org.gcube.data.analysis.algorithms.supportvectormachine.SupportVectorMachineTrainer -SUPPORT_VECTOR_MACHINE_REGRESSOR=org.gcube.data.analysis.algorithms.supportvectormachine.SupportVectorMachineRegressor -WEBTG_V2=org.gcube.dataanalysis.executor.rscripts.WebTGV2 -CMSY_FOR_DLM_TOOL=org.gcube.dataanalysis.executor.rscripts.CMSYFORDLMTOOL -TEST_SAI_WS_INTERACTION=org.gcube.dataanalysis.executor.rscripts.TESTSAIWSINTERACTION -GEO_INTERPOLATION=org.gcube.dataanalysis.seadatanet.SeaDataNetConnector_AutoCorrelation diff --git a/smartgears/dataminer_app/files/userperspective.properties b/smartgears/dataminer_app/files/userperspective.properties deleted file mode 100644 index 91c68de6..00000000 --- a/smartgears/dataminer_app/files/userperspective.properties +++ /dev/null @@ -1,46 +0,0 @@ -FILTERING=HCAF_FILTER -OCCURRENCES=OCCURRENCES_SUBTRACTION,OCCURRENCES_MERGER,OCCURRENCES_INTERSECTOR,ABSENCE_CELLS_FROM_AQUAMAPS,OCCURRENCES_DUPLICATES_DELETER,OCCURRENCES_MARINE_TERRESTRIAL,PRESENCE_CELLS_GENERATION,ABSENCE_GENERATION_FROM_OBIS -CLIMATE=BIOCLIMATE_HCAF,BIOCLIMATE_HSPEC,BIOCLIMATE_HSPEN -TAXA=BIONYM_LOCAL,BIONYM,BIONYM_BIODIV -TIME_SERIES=HCAF_INTERPOLATION,TIME_SERIES_ANALYSIS -OBIS_OBSERVATIONS_SPECIES_DATA=MOST_OBSERVED_SPECIES,MOST_OBSERVED_TAXA,SPECIES_OBSERVATIONS_PER_AREA -OBIS_OBSERVATIONS_TRENDS=SPECIES_OBSERVATIONS_TREND_PER_YEAR,SPECIES_OBSERVATION_LME_AREA_PER_YEAR,SPECIES_OBSERVATION_MEOW_AREA_PER_YEAR,TAXONOMY_OBSERVATIONS_TREND_PER_YEAR -DATABASES=GETTABLEDETAILS,LISTDBINFO,LISTDBNAMES,LISTDBSCHEMA,LISTTABLES,RANDOMSAMPLEONTABLE,SAMPLEONTABLE,SMARTSAMPLEONTABLE,SUBMITQUERY -GEO_PROCESSING=XYEXTRACTOR,XYEXTRACTOR_TABLE,ZEXTRACTION,ZEXTRACTION_TABLE,TIMEEXTRACTION,TIMEEXTRACTION_TABLE,SEADATANET_INTERPOLATOR,ESRI_GRID_EXTRACTION,OCCURRENCE_ENRICHMENT,CSQUARES_TO_COORDINATES,CSQUARE_COLUMN_CREATOR,FAO_OCEAN_AREA_COLUMN_CREATOR,FAO_OCEAN_AREA_COLUMN_CREATOR_FROM_QUADRANT,GRID_CWP_TO_COORDINATES,CSV_TO_NETCDF_CONVERTER_XY,CSV_TO_NETCDF_CONVERTER_XYZ,CSV_TO_NETCDF_CONVERTER_XYT,CSV_TO_NETCDF_CONVERTER_XYZT,CSV_TO_NETCDF_CONVERTER_DIMCHAR,GEO_INTERPOLATION -CHARTS=TIME_GEO_CHART,TIME_SERIES_CHARTS,GEO_CHART,GENERIC_CHARTS -STOCK_ASSESSMENT=KNITR_COMPILER,ECOPATH_WITH_ECOSIM,ENSEMBLE_MODEL,CCAMLR_EXPORTER_TOOL,CMSY_2,CMSY_FOR_DLM_TOOL -VESSELS=SGVM_INTERPOLATION,ESTIMATE_FISHING_ACTIVITY,ESTIMATE_MONTHLY_FISHING_EFFORT -BAYESIAN_METHODS=MAX_ENT_NICHE_MODELLING,LWR,CMSY,FAOMSY,FEED_FORWARD_A_N_N_DISTRIBUTION,FEED_FORWARD_NEURAL_NETWORK_TRAINER,FEED_FORWARD_NEURAL_NETWORK_REGRESSOR,FEED_FORWARD_NEURAL_NETWORK_CLOUD_REGRESSOR -PUBLISHING=RASTER_DATA_PUBLISHER,WEB_APP_PUBLISHER,SHAPEFILE_PUBLISHER,SHAPEFILE_IMPORTER -MAPS=POLYGONS_TO_MAP,SPECIES_MAP_FROM_CSQUARES,SPECIES_MAP_FROM_POINTS,POINTS_TO_MAP,MAPS_COMPARISON -EGIP=EGIP_ENERGY_AGGREGATED_DISTRIBUTION,EGIP_ENERGY_COUNTRY_DISTRIBUTION,EGIP_ENERGY_TRENDS,EGIP_ENERGY_YEAR_DISTRIBUTION -CORRELATION_ANALYSIS=HRS,KAPPA_COEFFICIENT -PERFORMANCES_EVALUATION=QUALITY_ANALYSIS,DISCREPANCY_ANALYSIS -DATA_CLUSTERING=DBSCAN,LOF,KMEANS,XMEANS -TRAINING=AQUAMAPSNN,HSPEN,FEED_FORWARD_ANN -SPECIES_SIMULATION=AQUAMAPS_NATIVE,AQUAMAPS_NATIVE_2050,AQUAMAPS_SUITABLE,AQUAMAPS_SUITABLE_2050,AQUAMAPS_NATIVE_NEURALNETWORK,AQUAMAPS_SUITABLE_NEURALNETWORK -SYSTEM=GENERIC_WORKER -ICHTHYOP_MODEL=ICHTHYOP_MODEL_ONE_BY_ONE,ICHTHYOP_MODEL_MULTIPLE_RUNS,MAKE_ICHTHYOP_NETCDF_CF_COMPLIANT,ICHTHYOP_NETCDF_OUTPUT_TO_SHAPEFILE,SPATIAL_DISTRIBUTION_OF_CORRELATION,SCATTERPLOT_DIAGRAM,SPATIAL_DENSITY_DISTRIBUTION,SMOOTH_SCATTERPLOT_DIAGRAM,ENRICHMENT_FROM_NETCDF -ICCAT_EASTERN_BFT_STOCK_ASSESSMENT=STEP_3___VPA_ICCAT_BFT_E_PROJECTION,STEP_2__VPA_ICCAT_BFT_E_VISUALISATION,PARALLELIZED_STEP1_VPA_ICCAT_BFT_E_RETROS,STEP_4_VPA_ICCAT_BFT_E_REPORT,PROJECTIONS_REPORT_VPA_ICCAT_BFT_E,WHOLE_STEPS_VPA_ICCAT_BFT_E,NCOUTPUTS2CSV_VPA_ICCAT_BFT_E,STEP_1___VPA_ICCAT_BFT_E_RETROS_ONERUN,STEP_1___VPA_ICCAT_BFT_E_RETROS -ACCESS_TUNA_ATLAS_DATA=TUNA_ATLAS_DATA_ACCESS,CATCHES_BY_SPECIES,CATCHES_BY_FLAGS,GLOBAL_CATCHES,CATCHES_BY_TYPE_OF_SCHOOL,CATCHES_BY_GEAR_SIMPLIFIED_VERSION,CATCHES_BY_FLAGS_SIMPLIFIED_VERSION,CATCHES_BY_SPECIES_SIMPLIFIED_VERSION,CATCHES_BY_GEARS,COMPUTE_FISHERIES_INDICATORS_FROM_OWN_FORMATTED_DATASET,CATCHES_AGGREGATED_FOLLOWING_A_SELECT_VARIABLE,CATCHES_INDICATORS_IOTC_REST_SERVICES,TRANSFORM_IOTC_CATCH_AND_EFFORT_DSD_CECOASTAL_AND_CESURFACE,LOAD_CATCHES_DATASET_IN_SARDARA,LOAD_EFFORTS_DATASET_IN_SARDARA -FIGIS_SPREAD=FIGIS_SPATIAL_REALLOCATION_SIMPLIFIED,FIGIS_SPATIAL_REALLOCATION_GENERIC,FIGIS_SPATIAL_REALLOCATION_SIMPLIFIED_TABLE -FIGIS_STATS=FIGIS_SDMX_DATA_CONVERTER -SAI_IMPORTED=GENETICALGORITHM,MPA_INTERSECT_V2,QUICK_RANK_TRAIN,QUICK_RANK_TRAIN_NO_VALIDATION,QUICK_RANK_TEST,STAT_VAL,TUNA_ATLAS_INDICATOR_1__SPECIES_BY_OCEAN_,SIMULFISHKPIS,READWFS,STAT_VAL_UNIPARTITE_NET,TESTING_ALGORITHM,MATLAS_OPTICS_CLUSTERING,MATLAS_TRAJECTORY_BUILDER,TWITTER_MONITOR,SCUBE -TRANSFORM_AND_LOAD_TUNA_ATLAS_DATA=IMPORT_FISHERIES_FORMATTED_DATASET___QUICK_IMPORT,LOAD_A_DATASET_IN_SARDARA_DATABASE,TRANSFORM_CCSBT_TASK2_LONGLINE -ENVRI=WTG,WEBTG_V2 -GATE_CLOUD=ENGLISH_NAMED_ENTITY_RECOGNIZER,ENGLISH_NAMED_ENTITY_RECOGNIZER_FOR_TWEETS,GERMAN_NAMED_ENTITY_RECOGNIZER,LANGUAGE_IDENTIFICATION_FOR_TWEETS,ENGLISH_TWEET_TOKENIZER,FRENCH_NAMED_ENTITY_RECOGNIZER,PART_OF_SPEECH_TAGGER_FOR_TWEETS,CYMRIE_WELSH_NAMED_ENTITY_RECOGNIZER,FRENCH_NAMED_ENTITY_RECOGNIZER_FOR_TWEETS,GERMAN_NAMED_ENTITY_RECOGNIZER_FOR_TWEETS,ENGLISH_PART_OF_SPEECH_AND_MORPHOLOGY_ANAYLIZER,NOUN_PHRASE_CHUNKER,MEASUREMENT_EXPRESSION_ANNOTATOR,ANNIE_PLUS_MEASUREMENTS,GENERIC_OPINION_MINING_ENGLISH,DECARBONET_ENVIRONMENTAL_ANNOTATOR,DECARBONET_GERMAN_ENVIRONMENTAL_ANNOTATOR,TWITTER_OPINION_MINING_ENGLISH,THE_BREXIT_ANALYZER_PIPELINE,SUMMA_TEXT_SUMMARIZATION_EN,SUMMA_TEXT_SUMMARIZATION_ES,OPEN_NLP_ENGLISH_PIPELINE,OPEN_NLP_GERMAN_PIPELINE,OPEN_NLP_DUTCH_PIPELINE -CREATE_OWN_TUNA_ATLAS=CREATE_YOUR_OWN_VERSION_OF_THE_TUNA_ATLAS -WORKFLOWS=SAMPLE_KNIME_WORKFLOW,KNIME_WORKSPACE_FILE_UPLOADER -NETWORK_RECONSTRUCTION=MAXANDSAM_NETWORK_RECONTRUCTION_METHOD -SYSTEMIC_RISK_ESTIMATION=DEBTRANK_SYSTEMIC_RISK_ESTIMATION -DEVELOPMENT=PROJECT_SIMULFISHKPIS_DEV -BLACK_BOX=R_SAMPLE -NERLIX_ALGORITHMS=STANBOL_WRAPPER -GEOSPATIAL=GEOGRAPHIC_PROXIMITY_TOOL -GRSF=GEOGRSF_INTERSECTS_BATCH,GEOGRSF_INTERSECTS,GEOGRSF_BBOXLIST -PREPRODUCTION=SIMULFISHKPIS_PRE -BLUEBRIDGE_PROJECT_VRE=MPASINTERSECTIONANALYSIS,MPA_INTERSECT_V3,MPA_INTERSECT_V3_2 -STATISTICAL_ALGORITHMS=VSURF,TRAIN -DATA_PUBLISHERS=AAPS_STAGING_PUBLISHER,AAPS_PUBLIC_PUBLISHER,AAPS_NASO_PUBLISHER -MACHINE_LEARNING_METHODS=SUPPORT_VECTOR_MACHINE_TRAINER,SUPPORT_VECTOR_MACHINE_REGRESSOR -TESTS=TEST_SAI_WS_INTERACTION diff --git a/smartgears/dataminer_app/tasks/dataminer-algorithms-installer.yml b/smartgears/dataminer_app/tasks/dataminer-algorithms-installer.yml deleted file mode 100644 index 30d1a37b..00000000 --- a/smartgears/dataminer_app/tasks/dataminer-algorithms-installer.yml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- block: - - name: Install the subversion packages - become_user: root - apt: pkg=subversion state=present update_cache=yes cache_valid_time=1800 - - - name: Create a directory where to install the algorithms directory - file: path={{ smartgears_user_home }}/wps_algorithms/algorithms state=directory - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] - - - name: Download the WPS algorithms from subversion - subversion: repo={{ dataminer_wps_algorithms_svn }} dest={{ smartgears_user_home }}/wps_algorithms/algorithms/{{ dataminer_infra_reference }} checkout=yes force=yes update=yes - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] - - become: True - become_user: '{{ smartgears_user }}' - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - - -# This is only needed to force an upgrade of the algorithm importer script and libraries -- block: - - name: Remove the old dataminer algorithm installer to force an upgrade - file: path={{ smartgears_user_home }}/algorithmInstaller state=absent - - - name: Remove the old dataminer algorithm installer distributions from the downloads directory - shell: rm -fr {{ smartgears_user_home }}/downloads/dataminer-algorithms-importer*.tar.gz - - become: True - become_user: '{{ smartgears_user }}' - when: - - dataminer_algorithms_installer - - dataminer_algorithms_upgrade - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - - -- block: - - name: Get the algorithms installer via maven_artifact - maven_artifact: artifact_id={{ dataminer_algorithms_name }} version={{ dataminer_algorithms_version | default(omit) }} group_id={{ dataminer_algorithms_group_id }} extension={{ dataminer_algorithms_extension | default('war') }} repository_url={{ dataminer_algorithms_base_url }} dest={{ smartgears_downloads_dir }}/{{ dataminer_algorithms_file }} - register: algorithms_installer_downloaded - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - - - name: Remove the old dataminer algorithm installer - file: path={{ smartgears_user_home }}/algorithmInstaller state=absent - when: algorithms_installer_downloaded is changed - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - - - name: Unarchive the algorithms installer - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ dataminer_algorithms_file }} dest={{ smartgears_user_home }} creates='{{ smartgears_user_home }}/algorithmInstaller/addAlgorithm.sh' - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - - - name: Create a directory where to install the algorithms updater logs and data - file: path={{ smartgears_user_home }}/wps_algorithms_install_log state=directory - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_script' ] - - - name: Install a script that updates the algorithms repository and adds the missing algorithms configurations - become_user: "{{ d4science_ansible_become_user | default('root') }}" - template: src=algorithms-updater.j2 dest=/usr/local/bin/algorithms-updater mode=0755 - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_script' ] - - become: True - become_user: '{{ smartgears_user }}' - when: dataminer_algorithms_installer - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - -- block: - - name: Cron job that updates the algorithms repository and adds the missing algorithms configurations - cron: name="SVN update the algorithms repository" minute="{{ dataminer_algorithms_updater_minute_frequency }}" hour="{{ dataminer_algorithms_updater_hour_frequency }}" job="/usr/local/bin/algorithms-updater > {{ smartgears_user_home }}/wps_algorithms_install_log/algorithms_updater_cron.log 2>&1" user='{{ smartgears_user }}' state={{ dataminer_algorithms_updater_cron }} - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_cron' ] - - become: True - become_user: '{{ smartgears_user }}' - when: dataminer_algorithms_updater - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - -- block: - - name: Remove the cron job that updates the algorithms repository and adds the missing algorithms configurations - cron: name="SVN update the algorithms repository" minute="{{ dataminer_algorithms_updater_minute_frequency }}" hour="{{ dataminer_algorithms_updater_hour_frequency }}" job="/usr/local/bin/algorithms-updater > {{ smartgears_user_home }}/wps_algorithms_install_log/algorithms_updater_cron.log 2>&1" user='{{ smartgears_user }}' state={{ dataminer_algorithms_updater_cron }} state=absent - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_cron' ] - - become: True - become_user: '{{ smartgears_user }}' - when: not dataminer_algorithms_updater - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_installer' ] - - \ No newline at end of file diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml deleted file mode 100644 index f74fb650..00000000 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ /dev/null @@ -1,78 +0,0 @@ ---- -- block: - - name: Get and unpack the dataminer application - maven_artifact: artifact_id={{ dataminer_wps_name }} version={{ dataminer_wps_version | default(omit) }} group_id={{ dataminer_wps_group_id }} extension={{ dataminer_wps_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ dataminer_wps_file }} verify_checksum=always - register: dataminer_app_downloaded - - - name: Remove the old dataminer installation - file: path={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }} state=absent - when: dataminer_app_downloaded is changed - - - name: Create the dataminer wps working directory - file: path={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Unarchive the dataminer_wps war - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ dataminer_wps_file }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }} creates='{{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/WEB-INF/lib' - register: dataminer_updated - notify: Restart smartgears - - - name: Install the dataminer web.xml - template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/WEB-INF/web.xml - notify: Restart smartgears - tags: [ 'dataminer', 'wps', 'wps_webxml' ] - - - name: Install the old properties files - copy: src={{ item }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/{{ item }} force=yes - with_items: '{{ dataminer_properties_files }}' - tags: [ 'dataminer', 'wps', 'wps_properties' ] - - - name: Install the script that fixes the WPS configuration - become_user: "{{ d4science_ansible_become_user | default('root') }}" - template: src=wps-config-fixer.j2 dest=/usr/local/bin/wps-config-fixer owner=root group=root mode=0555 - with_items: '{{ tomcat_m_instances }}' - tags: [ 'dataminer', 'wps', 'wps_config' ] - - - name: Fix the WPS config file - shell: /usr/local/bin/wps-config-fixer - notify: Restart smartgears - when: dataminer_updated is changed - tags: [ 'dataminer', 'wps', 'wps_config' ] - - - name: Force the fix of the WPS config file - shell: /usr/local/bin/wps-config-fixer - notify: Restart smartgears - when: dataminer_force_reconfiguration is defined and dataminer_force_reconfiguration - tags: [ 'dataminer', 'wps', 'wps_config' ] - - - name: Remove the file that lists the installed algorithms, after an upgrade - file: dest={{ smartgears_user_home }}/wps_algorithms_install_log/already_installed_algorithms.txt state=absent - register: reinstall_algorithms - when: dataminer_updated is changed - - - name: After an update, reinstall the algorithms - shell: /usr/local/bin/algorithms-updater & - when: - - reinstall_algorithms is changed - - dataminer_algorithms_installer - - become: True - become_user: '{{ smartgears_user }}' - tags: [ 'dataminer', 'wps' ] - -- block: - - name: Verify if R is installed - stat: path=/usr/bin/R - register: r_installed - - - name: Configure the JDK environment - shell: export JAVA_HOME={{ jdk_java_home }} ; export J2SDKDIR={{ jdk_java_home }} ; export J2REDIR={{ jdk_java_home }}/jre ; R CMD javareconf ; touch /etc/R/.java{{ jdk_default }}.env_conf - args: - creates: '/etc/R/.java{{ jdk_default }}.env_conf' - when: - - jdk_java_home is defined - - jdk_default is defined - - r_installed.stat.executable is defined and r_installed.stat.executable - - become: True - become_user: root - tags: [ 'tomcat', 'dataminer', 'wps', 'r_java' ] diff --git a/smartgears/dataminer_app/tasks/dataminer-external-files.yml b/smartgears/dataminer_app/tasks/dataminer-external-files.yml deleted file mode 100644 index d8be5a3a..00000000 --- a/smartgears/dataminer_app/tasks/dataminer-external-files.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- block: - - - name: Create a directory where to install the gebco_08.nc data file - file: path={{ smartgears_user_home }}/data state=directory - - - name: Install the gebco_08.nc file from thredds. It is big, mostly 2GB - get_url: url={{ dataminer_data_file_from_thredds }} dest={{ smartgears_user_home }}/data/gebco_08.nc timeout=2400 - - - name: Create a symlink to the gebco_08.nc file - file: src={{ smartgears_user_home }}/data/gebco_08.nc dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/gebco_08.nc state=link - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: - - dataminer_app_install - - dataminer_download_gebco_file - tags: [ 'tomcat', 'dataminer', 'wps' ] - \ No newline at end of file diff --git a/smartgears/dataminer_app/tasks/dataminer-upgrade.yml b/smartgears/dataminer_app/tasks/dataminer-upgrade.yml deleted file mode 100644 index aded6302..00000000 --- a/smartgears/dataminer_app/tasks/dataminer-upgrade.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- block: - - name: If it is an upgrade, shut down the server - service: name=tomcat-instance-{{ smartgears_http_port }} state=stopped - - - name: If it is an upgrade, brutally remove the wps installation - file: dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }} state=absent - - when: - - dataminer_app_install - - dataminer_app_upgrade - tags: [ dataminer', 'dataminer_upgrade', 'wps' ] diff --git a/smartgears/dataminer_app/tasks/install-gcube-key.yml b/smartgears/dataminer_app/tasks/install-gcube-key.yml deleted file mode 100644 index b4c9e2dc..00000000 --- a/smartgears/dataminer_app/tasks/install-gcube-key.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- block: - - name: Install the production gcube keys into the dataminer webapp - get_url: url={{ item.url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/PARALLEL_PROCESSING/{{ item.name }} owner={{ smartgears_user }} group={{ smartgears_user }} mode=0600 - with_items: '{{ gcube_production_security_keys }}' - notify: Restart smartgears - when: install_gcube_prod_key - - - name: Remove the production gcube keys from the dataminer webapp - file: dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/PARALLEL_PROCESSIN/{{ item.name }} state=absent - with_items: '{{ gcube_production_security_keys }}' - notify: Restart smartgears - when: not install_gcube_prod_key - - - name: Install the devel gcube keys into the dataminer webapp - get_url: url={{ item.url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/PARALLEL_PROCESSING/{{ item.name }} owner={{ smartgears_user }} group={{ smartgears_user }} mode=0600 - with_items: '{{ gcube_dev_security_keys }}' - notify: Restart smartgears - when: install_gcube_dev_key - - - name: Remove the devel gcube keys from the dataminer webapp - file: dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/PARALLEL_PROCESSING/{{ item.name }} state=absent - with_items: '{{ gcube_dev_security_keys }}' - notify: Restart smartgears - when: not install_gcube_dev_key - - - name: Install the preprod gcube keys into the dataminer webapp - get_url: url={{ item.url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/PARALLEL_PROCESSING/{{ item.name }} owner={{ smartgears_user }} group={{ smartgears_user }} mode=0600 - with_items: '{{ gcube_preprod_security_keys }}' - notify: Restart smartgears - when: install_gcube_preprod_key - - - name: Remove the preprod gcube keys from the dataminer webapp - file: dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/PARALLEL_PROCESSING/{{ item.name }} state=absent - with_items: '{{ gcube_preprod_security_keys }}' - notify: Restart smartgears - when: not install_gcube_preprod_key - - - name: Remove obsolete or expired gcube keys from the dataminer webapp - file: dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/PARALLEL_PROCESSING/{{ item.name }} state=absent - with_items: '{{ gcube_old_security_keys }}' - notify: Restart smartgears - when: not install_gcube_preprod_key - - become: True - become_user: '{{ smartgears_user }}' - tags: [ 'dataminer', 'gcube_key', 'wps' ] diff --git a/smartgears/dataminer_app/tasks/main.yml b/smartgears/dataminer_app/tasks/main.yml deleted file mode 100644 index 19fd157c..00000000 --- a/smartgears/dataminer_app/tasks/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- import_tasks: dataminer-upgrade.yml - when: dataminer_app_upgrade -- import_tasks: dataminer-app.yml - when: dataminer_app_install -- import_tasks: dataminer-external-files.yml - when: dataminer_app_install -- import_tasks: install-gcube-key.yml -- import_tasks: dataminer-algorithms-installer.yml - when: dataminer_app_install diff --git a/smartgears/dataminer_app/templates/algorithms-updater.j2 b/smartgears/dataminer_app/templates/algorithms-updater.j2 deleted file mode 100644 index 7dd29a28..00000000 --- a/smartgears/dataminer_app/templates/algorithms-updater.j2 +++ /dev/null @@ -1,229 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -PROCNUM=$$ -INFRA_REFERENCE={{ dataminer_infra_reference }} -ADD_ALGORITHM_DIR={{ smartgears_user_home }}/algorithmInstaller -ADD_ALGORITHM_PATH={{ smartgears_user_home }}/algorithmInstaller/addAlgorithm.sh -ALGORITHMS_FILE="{{ dataminer_wps_algorithms_dest }}/${INFRA_REFERENCE}/algorithms" -OUT_DIR=$( mktemp -d -t algorithms-updater.XXXXXXXXXX ) -ALGORITHMS_TEMP_SCRIPT=$OUT_DIR/add_algorithms -LOG_DIR={{ smartgears_user_home }}/wps_algorithms_install_log -LOG_FILE=${LOG_DIR}/algorithms_updater.log -ALGORITHMS_INSTALLED_FILE=${LOG_DIR}/already_installed_algorithms.txt -ALGORITHMS_INSTALLED_SORTED_FILE=${LOG_DIR}/already_installed_algorithms_sorted.txt -LOCK_FILE=${LOG_DIR}/.algorithms_updater.lock -ALGO_BASE_DIR={{ dataminer_wps_algorithms_dest }} -ALGO_DIR=${ALGO_BASE_DIR}/${INFRA_REFERENCE} -SVN_ALGORITHMS_URL={{ dataminer_wps_algorithms_svn }} -SVN_UPDATE_STATUS= -SVN_ALGORITHMS_NUM= -INSTALLED_ALGORITHMS_NUM= -# In seconds. 60*60*6=21600s (6h) -UPDATER_PROCESS_MAX_RUNTIME=21600 -OLDPROC= -OLDPROC_RUNNING= - -trap "logger 'algorithms-updater: trap intercepted, exiting.' ; cleanup 1" SIGHUP SIGINT SIGTERM - -cleanup() { - rm -fr $OUT_DIR - rm -f $LOCK_FILE - logger 'algorithms-updater: Exiting' - exit $1 -} - -create_log_dir() { - if [ ! -d $LOG_DIR ] ; then - mkdir -p $LOG_DIR - fi -} - - check_lock_file() { - # Create the lock file - if [ -f "$LOCK_FILE" ] ; then - set +o pipefail - set +e - OLDPROC=$( cat "$LOCK_FILE" ) - OLDPROC_RUNNING=$( ps auwwx | grep -v grep | awk '{ print $2 }' | grep "$OLDPROC" ) - if [ ! -z "$OLDPROC_RUNNING" ] ; then - logger "algorithms_updater: pid of the already running process: $OLDPROC_RUNNING" - OLDPROC_RUNNING_TIME=$( ps -o etimes= -p "${OLDPROC_RUNNING}" ) - if [ "$OLDPROC_RUNNING_TIME" -gt $UPDATER_PROCESS_MAX_RUNTIME ] ; then - logger "algorithms_updater: process $OLDPROC_RUNNING was running for $OLDPROC_RUNNING_TIME seconds. Got stuck, killing it" - kill -9 "$OLDPROC_RUNNING" - rm -f "$LOCK_FILE" - else - logger "algorithms_updater: another process is running, exiting." - rm -fr "$OUT_DIR" - exit 0 - fi - else - logger "algorithms_updater: lock file exist but the process not. Continuing." - rm -f "$LOCK_FILE" - fi - else - logger 'algorithms-updater: no other jobs running, proceeding.' - fi - set -o pipefail - set -e - echo "$PROCNUM" > "$LOCK_FILE" -} - -update_svn_repo() { - if [ -d $ALGO_DIR ]; then - logger 'algorithms-updater: update the SVN repo' - cd $ALGO_DIR - # Do a svn cleanup to be on the safe side - set +o pipefail - set +e - SVN_CLEANUP_OP=$( svn cleanup ) - SVN_UPDATE_OP=$( svn update | tail -1 | grep Updated >$LOG_FILE 2>&1 ) - SVN_UPDATE_STATUS=$? - set -o pipefail - set -e - else - cd $ALGO_BASE_DIR - logger "algorithms-updater: First subversion checkout" - svn co $SVN_ALGORITHMS_URL >> $LOG_FILE 2>&1 - fi -} - - sort_installed_algo_file() { - if [ -f $ALGORITHMS_INSTALLED_FILE ] ; then - sort -u $ALGORITHMS_INSTALLED_FILE > $ALGORITHMS_INSTALLED_SORTED_FILE - mv $ALGORITHMS_INSTALLED_SORTED_FILE $ALGORITHMS_INSTALLED_FILE - fi -} - - algorithms_updater() { - logger 'algorithms-updater: scan the algorithms list and build the algorithms script. Reference infra is {{ dataminer_infra_reference }}' - echo "#!/bin/bash" > $ALGORITHMS_TEMP_SCRIPT.head - echo "cd $ADD_ALGORITHM_DIR" >> $ALGORITHMS_TEMP_SCRIPT.head - echo "" >> $ALGORITHMS_TEMP_SCRIPT.head - awk -F \| '{ print $2 "|" $6 "|" $8 }' $ALGORITHMS_FILE > $ALGORITHMS_TEMP_SCRIPT.algorithmslist - sed -i -e 's///g' $ALGORITHMS_TEMP_SCRIPT.algorithmslist - sed -i -e 's/<\/notextile>"//g' $ALGORITHMS_TEMP_SCRIPT.algorithmslist - sed -i -e 's/<\/notextile>//g' $ALGORITHMS_TEMP_SCRIPT.algorithmslist - sed -i -e 's/\ N\ /\ Y\ /g' $ALGORITHMS_TEMP_SCRIPT.algorithmslist - sed -i -e 's/\[/\ /g' $ALGORITHMS_TEMP_SCRIPT.algorithmslist - sed -i -e 's/\]/\ /g' $ALGORITHMS_TEMP_SCRIPT.algorithmslist - if [ ! -f $ALGORITHMS_INSTALLED_FILE ] ; then - touch $ALGORITHMS_INSTALLED_FILE - fi - set +o pipefail - set +e - while read algo ; do - ALGO_PRESENT= - ALGO_NAME=$( echo "$algo" | awk -F \| '{ print $1 }' ) - ALGO_BODY_PRE=$( echo "$algo" | awk -F \| '{ print $2 }' ) - ALGO_BODY="${ALGO_BODY_PRE} ${INFRA_REFERENCE}/software" - ALGO_BODY=$( sed "s/'/ /g" <<< ${ALGO_BODY} ) - ALGO_DATE=$( echo "$algo" | awk -F \| '{ print $3 }' ) - ALGO_TIMESTAMP=$( date +%s -d "$ALGO_DATE" 2>/dev/null ) - if [ $? -ne 0 ] ; then - echo "the date for algorithm $ALGO_NAME is wrong" - else - ALGO_LINE=$( egrep ^"$ALGO_NAME " $ALGORITHMS_INSTALLED_FILE ) - ALGO_PRESENT=$? - if [ $ALGO_PRESENT -ne 0 ] ; then - echo "logger 'algorithms-updater: New algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "logger 'algorithms-updater: running the add command of algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "logger 'algorithms-updater: the add command string is ${ALGO_BODY}'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "RETVAL=" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo '-------------------------------------------'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo 'Adding algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo 'With command ${ALGO_BODY}'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "cd ${ADD_ALGORITHM_DIR}" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "${ALGO_BODY}" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo 'RETVAL=$?' >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo 'Done.'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo 'if [ $RETVAL -ne 0 ] ; then' >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " logger 'algorithms-updater: the adding of algorithm $ALGO_NAME failed'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "else" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " egrep -v ^\"$ALGO_NAME \" $ALGORITHMS_INSTALLED_FILE > ${ALGORITHMS_INSTALLED_FILE}_" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " mv ${ALGORITHMS_INSTALLED_FILE}_ $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " echo '$ALGO_NAME | $ALGO_DATE' >> $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " logger 'algorithms-updater: the adding of algorithm $ALGO_NAME succeeded'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "fi" >> $ALGORITHMS_TEMP_SCRIPT.body_ - else - ALGO_LOCAL_TIMESTAMP=0 - ALGO_LOCAL_DATE=$( egrep ^"$ALGO_NAME " $ALGORITHMS_INSTALLED_FILE | tail -1 | awk -F \| '{ print $2 }' | grep -v \' ) - ALGO_LOCAL_TIMESTAMP=$( date +%s -d "$ALGO_LOCAL_DATE" 2>/dev/null ) - if [ $? -ne 0 ] || [ $ALGO_LOCAL_TIMESTAMP -ne $ALGO_TIMESTAMP ]; then - echo "logger 'algorithms-updater: algorithm $ALGO_NAME is already present but a newer version exists'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "logger 'algorithms-updater: running the add command of algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "logger 'algorithms-updater: the add command string is ${ALGO_BODY}'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "RETVAL=" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo '-------------------------------------------'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo 'Adding algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo 'With command ${ALGO_BODY}'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "cd ${ADD_ALGORITHM_DIR}" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "${ALGO_BODY}" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo 'RETVAL=$?' >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo 'Done.'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "echo ''" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo 'if [ $RETVAL -ne 0 ] ; then' >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " logger 'algorithms-updater: the adding of algorithm $ALGO_NAME failed'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "else" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " egrep -v \"^$ALGO_NAME \" $ALGORITHMS_INSTALLED_FILE > ${ALGORITHMS_INSTALLED_FILE}_" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " mv ${ALGORITHMS_INSTALLED_FILE}_ $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " echo '$ALGO_NAME | $ALGO_DATE' >> $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo " logger 'algorithms-updater: the adding of algorithm $ALGO_NAME succeeded'" >> $ALGORITHMS_TEMP_SCRIPT.body_ - echo "fi" >> $ALGORITHMS_TEMP_SCRIPT.body_ - fi - fi - fi - done < ${ALGORITHMS_TEMP_SCRIPT}.algorithmslist - set -o pipefail - set -e - if [ -f $ALGORITHMS_TEMP_SCRIPT.body_ ] ; then - mv $ALGORITHMS_TEMP_SCRIPT.body_ $ALGORITHMS_TEMP_SCRIPT.body - cat $ALGORITHMS_TEMP_SCRIPT.head $ALGORITHMS_TEMP_SCRIPT.body > $ALGORITHMS_TEMP_SCRIPT - chmod 755 $ALGORITHMS_TEMP_SCRIPT - if [ -x $ADD_ALGORITHM_PATH ] ; then - logger 'algorithms-updater: add the algorithms configurations. Reference infra is {{ dataminer_infra_reference }}' - $ALGORITHMS_TEMP_SCRIPT >> $LOG_FILE 2>&1 - else - logger 'algorithms-updater: {{ smartgears_user_home }}/algorithmInstaller/addAlgorithm.sh is not an executable, aborting' - cleanup 1 - fi - else - cleanup 0 - fi -} - -# -# Main -# -create_log_dir -check_lock_file -update_svn_repo -if [ $SVN_UPDATE_STATUS -ne 0 ] ; then - if [ -d "${LOG_DIR}" ] ; then - if [ -f "$ALGORITHMS_INSTALLED_FILE" ] ; then - SVN_ALGORITHMS_NUM=$( wc -l "$ALGORITHMS_FILE" | awk '{print $1}' ) - INSTALLED_ALGORITHMS_NUM=$( wc -l "$ALGORITHMS_INSTALLED_FILE" | awk '{print $1}' ) - if [ $SVN_ALGORITHMS_NUM -gt $INSTALLED_ALGORITHMS_NUM ] ; then - logger "algorithms-updater: nothing new from SVN but the installed algorithms are less than the expected number. We are going to run the installer." - else - logger "algorithms-updater: nothing new from SVN and all the algorithms are installed, exiting." - cleanup 0 - fi - else - logger "algorithms-updater: nothing new from SVN but the file that lists the installed algorithms does not exist. We are going to reinstall all the algorithms." - fi - fi -fi -sort_installed_algo_file -algorithms_updater -cleanup 0 diff --git a/smartgears/dataminer_app/templates/web.xml.j2 b/smartgears/dataminer_app/templates/web.xml.j2 deleted file mode 100644 index 51dc9fdb..00000000 --- a/smartgears/dataminer_app/templates/web.xml.j2 +++ /dev/null @@ -1,143 +0,0 @@ - - - 52°North Web Processing Service, Git: - 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20 - - A web processing framework supporting the OGC WPS 1.0.0 specification - - excludeWritesOnSH - - {{ dataminer_webxml_users_excluded }} - - - algorithmDirectory - {{ dataminer_wps_algorithms_dest }}/{{ dataminer_infra_reference }}/software - - - maxComputation - {{ dataminer_maxcomputation }} - - - saveOnStorage - {{ dataminer_saveonstorage }} - - - simulationMode - {{ dataminer_simulationmode }} - - - - - - - - filter-mapping> CommunicationSizeLogFilter - /WebProcessingService - - - - - wpsServlet - org.gcube.data.analysis.wps.WebProcessingService - - 0 - - wps.config.file - config/wps_config.xml - - - - cancelComputationServlet - org.gcube.data.analysis.wps.CancelComputation - 1 - - - retrieveResultServlet - org.n52.wps.server.RetrieveResultServlet - 1 - - - wpsServlet - /WebProcessingService - - - retrieveResultServlet - /RetrieveResultServlet - - - cancelComputationServlet - /CancelComputationServlet - - - /index.html - - - - - security.config.validation - false - - - - - CORS - com.thetransactioncompany.cors.CORSFilter - - cors.allowOrigin - * - - - cors.allowGenericHttpRequests - true - - - cors.supportedMethods - GET, POST, HEAD, PUT, DELETE, OPTIONS - - - cors.supportedHeaders - * - - - cors.exposedHeaders - * - - - - CORS - /* - - - - - - - - diff --git a/smartgears/dataminer_app/templates/wps-config-fixer.j2 b/smartgears/dataminer_app/templates/wps-config-fixer.j2 deleted file mode 100644 index 873763d5..00000000 --- a/smartgears/dataminer_app/templates/wps-config-fixer.j2 +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -WPS_CONFIG_FILE='{{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/config/wps_config.xml' - -# Fix the hostname -{% if hostname is defined %} -sed -Ei 's/hostname=\".*\"\ hostport/hostname="{{ hostname }}" hostport/' "$WPS_CONFIG_FILE" -{% else %} -sed -Ei 's/hostname=\".*\"\ hostport/hostname="{{ smartgears_hostname }}" hostport/' "$WPS_CONFIG_FILE" -{% endif %} - -# Set the port. It is different from the tomcat one if there is a reverse proxy before the service. -# https has the precedence if it is available -# TODO: change back to http and https_port when https://support.d4science.org/issues/13024 if fixed and the new dataminer deployed -{% if setup_nginx %} -{% if https_port is defined %} -sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ http_port | default('80') }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE" -sed -Ei 's/protocol=\".*\"\ hostname/protocol="http" hostname/' "$WPS_CONFIG_FILE" -{% else %} -sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ http_port | default('80') }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE" -{% endif %} -{% else %} -sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ item.http_port }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE" -{% endif %} - -exit 0 diff --git a/smartgears/dataminer_app/templates/wps.xml.j2 b/smartgears/dataminer_app/templates/wps.xml.j2 deleted file mode 100644 index 65752a76..00000000 --- a/smartgears/dataminer_app/templates/wps.xml.j2 +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/smartgears/dm_pool_manager/defaults/main.yml b/smartgears/dm_pool_manager/defaults/main.yml deleted file mode 100644 index 70e9b4a3..00000000 --- a/smartgears/dm_pool_manager/defaults/main.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -dm_pool_manager_install: False -dm_pool_manager_upgrade: False -dm_pool_manager_version: latest -dm_pool_manager_name: dataminer-pool-manager - -dm_pool_manager_group_id: org.gcube.dataAnalysis -dm_pool_manager_extension: war -dm_pool_manager_file: '{{ dm_pool_manager_name }}-{{ dm_pool_manager_version }}.{{ dm_pool_manager_extension }}' - -dm_pool_prod_ghost_instance: 'dataminer-proto-ghost.d4science.org' -dm_pool_proto_ghost_instance: 'dataminer-proto-ghost.d4science.org' -dm_pool_preprod_ghost_instance: 'dataminer-ghost-t.pre.d4science.org' -dm_pool_dev_ghost_instance: 'dataminer-ghost-d.dev.d4science.org' -dm_pool_manager_pkgs: - - subversion - -dm_pool_svn_url: http://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis -svn_user: svn.d4science -svn_pass: "{{ vault_svn_pass }}" -prod_instance: False -proto_instance: False -preprod_instance: False -dev_instance: False - diff --git a/smartgears/dm_pool_manager/meta/main.yml b/smartgears/dm_pool_manager/meta/main.yml deleted file mode 100644 index 01e77f78..00000000 --- a/smartgears/dm_pool_manager/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: '../library/roles/ansible_ppa' - diff --git a/smartgears/dm_pool_manager/tasks/main.yml b/smartgears/dm_pool_manager/tasks/main.yml deleted file mode 100644 index d359b047..00000000 --- a/smartgears/dm_pool_manager/tasks/main.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- block: - - name: Remove the old dm_pool_manager files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }}.{{ dm_pool_manager_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not dm_pool_manager_install - tags: [ 'dm_pool_manager' ] - -- block: - - name: Get the dm_pool_manager - maven_artifact: artifact_id={{ dm_pool_manager_name }} version={{ dm_pool_manager_version | default(omit) }} group_id={{ dm_pool_manager_group_id }} extension={{ dm_pool_manager_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ dm_pool_manager_file }} verify_checksum=always - register: dm_pool_manager_download - - - name: Remove the old dm_pool_manager files - file: path={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} state=absent - when: dm_pool_manager_download is changed - - - name: Remove the work folder - file: dest={{ smartgears_user_home }}/dataminer-pool-manager/work state=absent - when: dm_pool_manager_download is changed - - - name: Remove the job folder - file: dest={{ smartgears_user_home }}/dataminer-pool-manager/jobs state=absent - when: dm_pool_manager_download is changed - - - - name: Create the dm_pool_manager working directory - file: path={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Unarchive the dm_pool_manager war - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ dm_pool_manager_file }} dest={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} creates={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }}/WEB-INF/lib - notify: Restart smartgears - -# - name: Install the dm-pool-manager web.xml template -# template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/dataminer-pool-manager/WEB-INF/web.xml mode=0440 - - - name: Ensures conf dir exists - file: path={{ item.user_home }}/dataminer-pool-manager/dpmConfig state=directory recurse=true - with_items: '{{ tomcat_m_instances }}' - - # Create a 2048-bit SSH key for user jsmith in ~jsmith/.ssh/id_rsa - - name: create user key - user: name='{{ smartgears_user }}' generate_ssh_key=yes ssh_key_bits=2048 ssh_key_file=.ssh/id_rsa - -# - name: Install the additional service default file -# template: src=service.properties.j2 dest={{ item.user_home }}/dataminer-pool-manager/dpmConfig/service.properties mode=0444 -# with_items: '{{ tomcat_m_instances }}' -# notify: Restart smartgears - - - name: Install the packages required to dm-pool-manager-service - become_user: root - apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 force=yes - with_items: '{{ dm_pool_manager_pkgs }}' - - - name: First checkout from subversion - subversion: repo={{ dm_pool_svn_url }} dest={{ smartgears_user_home }}/checkout checkout=yes force=yes update=yes username="{{ svn_user }}" password="{{ svn_pass }}" - when: not dm_pool_manager_upgrade - tags: [ 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] - - become: True - become_user: '{{ d4science_user }}' - when: dm_pool_manager_install - tags: [ 'dm_pool_manager' ] diff --git a/smartgears/dm_pool_manager/templates/service.properties.j2 b/smartgears/dm_pool_manager/templates/service.properties.j2 deleted file mode 100644 index d90e264c..00000000 --- a/smartgears/dm_pool_manager/templates/service.properties.j2 +++ /dev/null @@ -1,57 +0,0 @@ -#YML node file -SVN_REPO = https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/ - -svn.repository = https://svn.d4science.research-infrastructures.eu/gcube -svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms - -#STAGE -{% if prod_instance %} -STAGE_GHOST={{ dm_pool_prod_ghost_instance }} -svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms -svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/software -svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/prod/software -{% elif proto_instance %} -STAGE_GHOST={{ dm_pool_proto_ghost_instance }} -svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms -svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/software -svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/proto/software -{% elif preprod_instance %} -STAGE_GHOST={{ dm_pool_preprod_ghost_instance }} -svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/preprod/algorithms -svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/preprod/software -svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/preprod/software -{% else %} -STAGE_GHOST={{ dm_pool_dev_ghost_instance }} -svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms -svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/software -svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/dev/software -{% endif %} -svn.stage.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt -svn.stage.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt -svn.stage.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt -svn.stage.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt -svn.stage.deps-java = -svn.stage.deps-knime-workflow = -svn.stage.deps-octave = -svn.stage.deps-python = -svn.stage.deps-windows-compiled = - -#PROD -{% if prod_instance %} -PROD_GHOST={{ dm_pool_prod_ghost_instance }} -{% else %} -PROD_GHOST= -{% endif %} -svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms -svn.prod.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/software -svn.prod.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/prod/software - -svn.prod.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt -svn.prod.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt -svn.prod.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt -svn.prod.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt -svn.prod.deps-java = -svn.prod.deps-knime-workflow = -svn.prod.deps-octave = -svn.prod.deps-python = -svn.prod.deps-windows-compiled = diff --git a/smartgears/dm_pool_manager/templates/web.xml.j2 b/smartgears/dm_pool_manager/templates/web.xml.j2 deleted file mode 100644 index e0ac8652..00000000 --- a/smartgears/dm_pool_manager/templates/web.xml.j2 +++ /dev/null @@ -1,64 +0,0 @@ - - - - Archetype Created Web Application - - - Environment -{% if proto_instance %} - Proto -{% elif prod_instance %} - Prod -{% else %} - Dev -{% endif %} - - This is a context parameter example - - - - REST-API - org.glassfish.jersey.servlet.ServletContainer - - jersey.config.server.provider.packages - - io.swagger.jaxrs.listing, - org.gcube.dataanalysis.dataminer.poolmanager.rest - - 1 - - - - - - - - - REST-API - /api/* - - - - - - - - - - - - - - - - - diff --git a/smartgears/fhn_manager/defaults/main.yml b/smartgears/fhn_manager/defaults/main.yml deleted file mode 100644 index 45a2b7ab..00000000 --- a/smartgears/fhn_manager/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -fhn_manager_install: False -smart_executor_install: False -fhn_manager_version: 1.2.4-4.8.0-154701 -fhn_manager_name: fhn-manager-service -fhn_group_id: org.gcube.resources.federation -fhn_extension: war - -fhn_manager_file: '{{ fhn_manager_name }}-{{ fhn_manager_version }}.{{ fhn_extension }}' -fhn_manager_repository_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}' - diff --git a/smartgears/fhn_manager/meta/main.yml b/smartgears/fhn_manager/meta/main.yml deleted file mode 100644 index 9b20a211..00000000 --- a/smartgears/fhn_manager/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - { role: '../../library/roles/egi/voms', when: fhn_manager_install } - - { role: '../../library/roles/egi/occi', when: fhn_manager_install } diff --git a/smartgears/fhn_manager/tasks/main.yml b/smartgears/fhn_manager/tasks/main.yml deleted file mode 100644 index fe2e5459..00000000 --- a/smartgears/fhn_manager/tasks/main.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- block: - - name: Remove the old fhn-manager files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ fhn_manager_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ fhn_manager_name }}.{{ fhn_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not fhn_manager_install - tags: [ 'smartgears', 'fhn_manager', 'tomcat' ] - - -- block: - # NOTE: Install as the smartgears user so we do not mess with the permissions - - name: Get the fhn-manager-service - maven_artifact: artifact_id={{ fhn_manager_name }} version={{ fhn_manager_version | default(omit) }} group_id={{ fhn_group_id }} extension={{ fhn_extension | default('war') }} repository_url={{ fhn_manager_repository_url }} dest={{ smartgears_downloads_dir }}/{{ fhn_manager_file }} - register: fhn_mgr_download - - - name: Remove the old fhn-manager files - file: path={{ smartgears_instance_path }}/webapps/{{ fhn_manager_name }} state=absent - when: fhn_mgr_download is changed - notify: Restart smartgears - - - name: Copy the fhn_manager war file to its destination place - copy: src={{ smartgears_downloads_dir }}/{{ fhn_manager_file }} dest={{ smartgears_instance_path }}/webapps/{{ fhn_manager_name }}.{{ fhn_extension }} force=yes remote_src=yes - notify: Restart smartgears - - - name: Install the cron job that deletes the certificates from /tmp every day - cron: name="Delete tmp folder" special_time=daily job="find /tmp ! -name 'x509up_u1000' -type f -exec rm -f {} \; >/dev/null 2>&1" - - - name: Install the cron job that refresh certificates every week - become_user: root - cron: name="refresh certificates" special_time=weekly job="/usr/sbin/fetch-crl >/dev/null 2>&1" - - become: True - become_user: '{{ d4science_user }}' - when: fhn_manager_install - tags: [ 'smartgears', 'fhn_manager', 'tomcat' ] diff --git a/smartgears/gcat/defaults/main.yml b/smartgears/gcat/defaults/main.yml deleted file mode 100644 index cfc96785..00000000 --- a/smartgears/gcat/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -gcat_install: False -gcat_version: latest -gcat_name: 'gcat' -gcat_group_id: 'org.gcube.data-publishing' -gcat_extension: war -gcat_file: '{{ gcat_name }}-{{ gcat_version }}.{{ gcat_extension }}' - diff --git a/smartgears/gcat/tasks/main.yml b/smartgears/gcat/tasks/main.yml deleted file mode 100644 index bfbb8359..00000000 --- a/smartgears/gcat/tasks/main.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- block: - - name: Remove the old gcat catalogue ws files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ gcat_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ gcat_name }}.{{ gcat_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not gcat_install - tags: [ 'gcat' ] - -- block: - - name: Get the gcat war - maven_artifact: artifact_id={{ gcat_name }} version={{ gcat_version | default('latest') }} group_id={{ gcat_group_id }} extension={{ gcat_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ gcat_file }} verify_checksum=always - register: gcat_download - - - name: Remove the old gcat files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ gcat_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ gcat_name }}.{{ gcat_extension }}' - when: gcat_download is changed - - - name: Create the gcat working directory - file: path={{ smartgears_instance_path }}/webapps/{{ gcat_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - when: gcat_download is changed - - - name: Unarchive the gcat war - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ gcat_file }} dest={{ smartgears_instance_path }}/webapps/{{ gcat_name }} creates={{ smartgears_instance_path }}/webapps/{{ gcat_name }}/WEB-INF/lib - notify: Restart smartgears - - - name: Install the gcat configuration - template: src=config.properties.j2 dest={{ smartgears_instance_path }}/webapps/{{ gcat_name }}/WEB-INF/classes/config.properties mode=0440 - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: gcat_install - tags: [ 'gcat' ] - diff --git a/smartgears/gcat/templates/config.properties.j2 b/smartgears/gcat/templates/config.properties.j2 deleted file mode 100644 index d5180be0..00000000 --- a/smartgears/gcat/templates/config.properties.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ gcat_application_scope }}={{ gcat_application_token }} diff --git a/smartgears/gcat_controller_plugin/defaults/main.yml b/smartgears/gcat_controller_plugin/defaults/main.yml deleted file mode 100644 index 08cad35d..00000000 --- a/smartgears/gcat_controller_plugin/defaults/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -gcat_controller_plugin_install: False -gcat_controller_plugin_name: gCat-Controller - -gcat_controller_plugin_group_id : org.gcube.data-publishing.gCat-Feeder -gcat_controller_plugin_artifact_id : '{{ gcat_controller_plugin_name }}' -gcat_controller_plugin_version : latest -gcat_controller_plugin_extension: jar -gcat_controller_plugin_classifier: uberjar -gcat_controller_plugin_uber_file: '{{ gcat_controller_plugin_name }}-{{ gcat_controller_plugin_version }}-{{ gcat_controller_plugin_classifier }}.{{ gcat_controller_plugin_extension }}' -gcat_controller_plugin_file: '{{ gcat_controller_plugin_name }}-{{ gcat_controller_plugin_version }}.{{ gcat_controller_plugin_extension }}' - -catalina_apps_conf: - - { app_name: '{{ gfeed_service_name }}', plugin_name: '{{ gcat_controller_plugin_name }}' } diff --git a/smartgears/gcat_controller_plugin/meta/main.yml b/smartgears/gcat_controller_plugin/meta/main.yml deleted file mode 100644 index 2510b86d..00000000 --- a/smartgears/gcat_controller_plugin/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: '../library/roles/smartgears/catalina-app-conf' - diff --git a/smartgears/gcat_controller_plugin/tasks/main.yml b/smartgears/gcat_controller_plugin/tasks/main.yml deleted file mode 100644 index 7fd8ca11..00000000 --- a/smartgears/gcat_controller_plugin/tasks/main.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- block: - - name: Remove the old gcat controller plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ gcat_controller_plugin_name }} state=absent - - become: True - become_user: '{{ smartgears_user }}' - when: not gcat_controller_plugin_install - tags: [ 'gcat_plugin', 'gfeed_service' ] - -- block: - - name: Get the gcat plugin gfeed uber jar - maven_artifact: artifact_id={{ gcat_controller_plugin_name }} version={{ gcat_controller_plugin_version }} group_id={{ gcat_controller_plugin_group_id }} extension={{ gcat_controller_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ gcat_controller_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ gcat_controller_plugin_uber_file }} verify_checksum=always - register: gcat_plugin_download - - - name: Remove the old gcat plugin gfeed plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ gcat_controller_plugin_name }} state=absent - when: gcat_plugin_download is changed - - - name: Create the plugin directory inside gfeed - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ gcat_controller_plugin_name }} state=directory - register: gcat_plugin_create_dir - - - name: Unarchive the gcat plugin gfeed uber jar to expose its libraries - unarchive: src={{ smartgears_downloads_dir }}/{{ gcat_controller_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ gcat_controller_plugin_name }}/ copy=no - when: gcat_plugin_create_dir is changed - notify: Restart smartgears - - - name: Get the gcat plugin gfeed jar - maven_artifact: artifact_id={{ gcat_controller_plugin_name }} version={{ gcat_controller_plugin_version }} group_id={{ gcat_controller_plugin_group_id }} extension={{ gcat_controller_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ gcat_controller_plugin_name }} keep_name=yes - notify: Restart smartgears - - - name: Remove the gcat plugin uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}/WEB-INF/lib/plugins/{{ gcat_controller_plugin_name }}/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: gcat_controller_plugin_install - tags: [ 'gcat_plugin', 'gfeed_service' ] - diff --git a/smartgears/gcube-oauth/defaults/main.yml b/smartgears/gcube-oauth/defaults/main.yml deleted file mode 100644 index 6105dad8..00000000 --- a/smartgears/gcube-oauth/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -gcube_oauth_install: False -gcube_oauth_version: latest -gcube_oauth_name: oauth -gcube_oauth_group_id: org.gcube.portal -gcube_oauth_extension: war -gcube_oauth_file: '{{ gcube_oauth_name }}-{{ gcube_oauth_version }}.{{ gcube_oauth_extension }}' - diff --git a/smartgears/gcube-oauth/tasks/main.yml b/smartgears/gcube-oauth/tasks/main.yml deleted file mode 100644 index d7f95243..00000000 --- a/smartgears/gcube-oauth/tasks/main.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- block: - - name: Remove the old gcube oauth files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }}' - - '{{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }}.{{ gcube_oauth_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not gcube_oauth_install - tags: [ 'smartgears', 'gcube_oauth', 'tomcat' ] - -- block: - - name: Get the gcube-oauth war - maven_artifact: artifact_id={{ gcube_oauth_name }} version={{ gcube_oauth_version | default(omit) }} group_id={{ gcube_oauth_group_id }} extension={{ gcube_oauth_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ gcube_oauth_file }} verify_checksum=always - register: gcube_oauth_download - - - name: Remove the old gcube oauth files - file: path={{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }} state=absent - when: gcube_oauth_download is changed - notify: Restart smartgears - -# - name: Copy the gcube_oauth war into the webapps directory -# copy: src={{ smartgears_downloads_dir }}/{{ gcube_oauth_file }} dest={{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }}.{{ gcube_oauth_extension }} remote_src=yes force=yes -# notify: Restart smartgears - - - name: Create the oauth working directory - file: path={{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Unarchive the oauth war into the tomcat webapps dir - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ gcube_oauth_file }} dest={{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }} creates='{{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }}/WEB-INF/lib' - register: oauth_updated - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: gcube_oauth_install - tags: [ 'smartgears', 'gcube_oauth', 'tomcat' ] diff --git a/smartgears/gcubeapp-setup/defaults/main.yml b/smartgears/gcubeapp-setup/defaults/main.yml deleted file mode 100644 index 562f4d63..00000000 --- a/smartgears/gcubeapp-setup/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -gcubeapp_setup: False -gcubehandlers_setup: False -#gcubeapp_webapps: -# - { webapp_context: '', webapp_name: '', version: '', webapp_group: '', description: '', exclude_handlers: [ ">/*" ], gcubehandlers_requests: [ 'authentication-filter' ] } - diff --git a/smartgears/gcubeapp-setup/tasks/main.yml b/smartgears/gcubeapp-setup/tasks/main.yml deleted file mode 100644 index 96c37070..00000000 --- a/smartgears/gcubeapp-setup/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: Install the gcube-app file to make the webapp smartgears compatible - template: src=gcube-app.xml.j2 dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.webapp_context }}/WEB-INF/gcube-app.xml owner={{ smartgears_user }} group={{ smartgears_user }} - with_items: '{{ gcubeapp_webapps | default([]) }}' - notify: Restart smartgears - when: gcubeapp_setup - tags: [ 'smartgears', 'gcubeapp' ] - -- name: Install the gcube-handlers.xml file to manage the smartgears filters - template: src=gcube-handlers.xml.j2 dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.webapp_context }}/WEB-INF/gcube-handlers.xml owner={{ smartgears_user }} group={{ smartgears_user }} - with_items: '{{ gcubeapp_webapps | default([]) }}' - notify: Restart smartgears - when: gcubehandlers_setup - tags: [ 'smartgears', 'gcubeapp' ] - -- name: Remove the gcube-app.xml file when it is not needed - file: dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.webapp_context }}/WEB-INF/gcube-app.xml owner={{ smartgears_user }} group={{ smartgears_user }} state=absent - with_items: '{{ gcubeapp_webapps | default([]) }}' - notify: Restart smartgears - when: not gcubeapp_setup - tags: [ 'smartgears', 'gcubeapp' ] - -- name: Remove the gcube-handlers.xml file when it is not needed - file: dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.webapp_context }}/WEB-INF/gcube-handlers.xml owner={{ smartgears_user }} group={{ smartgears_user }} state=absent - with_items: '{{ gcubeapp_webapps | default([]) }}' - notify: Restart smartgears - when: not gcubehandlers_setup - tags: [ 'smartgears', 'gcubeapp' ] - diff --git a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 b/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 deleted file mode 100644 index ff10b790..00000000 --- a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 +++ /dev/null @@ -1,36 +0,0 @@ - - - {{ item.webapp_name }} - {{ item.webapp_group }} - {{ item.version }} -{% if item.description is defined %} - {{ item.description }} -{% endif %} -{% if webapp_proxy_endpoint is defined %} - - {{ webapp_proxy_endpoint }} -{% if webapp_proxy_protocol == 'https' %} - {{ webapp_proxy_port | default ('443') }} -{% elif webapp_proxy_protocol == 'http' %} - {{ webapp_proxy_port | default ('80') }} -{% else %} - {{ webapp_proxy_port }} -{% endif %} - -{% endif %} -{% if item.persistence_location is defined %} - -{% endif %} -{% if item.exclude_handlers is defined %} -{% for eh in item.exclude_handlers %} - -{% endfor %} -{% endif %} -{% if item.include_handlers is defined %} -{% for ih in item.include_handlers %} - -{% endfor %} -{% endif %} - - - diff --git a/smartgears/gcubeapp-setup/templates/gcube-handlers.xml.j2 b/smartgears/gcubeapp-setup/templates/gcube-handlers.xml.j2 deleted file mode 100644 index 1168f2ac..00000000 --- a/smartgears/gcubeapp-setup/templates/gcube-handlers.xml.j2 +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -{% for req in item. gcubehandlers_requests %} - <{{ req }} /> -{% endfor %} - - diff --git a/smartgears/generic_worker/defaults/main.yml b/smartgears/generic_worker/defaults/main.yml deleted file mode 100644 index 8cfe45ab..00000000 --- a/smartgears/generic_worker/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -generic_worker_install: False -smart_generic_worker_plugin_name: 'smart-generic-worker' -smart_generic_worker_plugin_group_id: 'org.gcube.dataanalysis' -smart_generic_worker_plugin_artifact_id: '{{ smart_generic_worker_plugin_name }}' -smart_generic_worker_plugin_version: latest -smart_generic_worker_plugin_extension: jar -smart_generic_worker_plugin_classifier: jar-with-dependencies -smart_generic_worker_plugin_file: '{{ smart_generic_worker_plugin_name }}-{{ smart_generic_worker_plugin_version }}-jar-with-dependencies.{{ smart_generic_worker_plugin_extension }}' - diff --git a/smartgears/generic_worker/tasks/main.yml b/smartgears/generic_worker/tasks/main.yml deleted file mode 100644 index 2bb655b8..00000000 --- a/smartgears/generic_worker/tasks/main.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- block: - - name: Remove the smart generic worker plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ smart_generic_worker_plugin_name }}-*-jar-with-dependencies.jar - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not generic_worker_install - tags: [ 'smartgears', 'generic_worker', 'tomcat' ] - -- block: - - name: Get the smart generic worker plugin and install it inside the smart executor - maven_artifact: artifact_id={{ smart_generic_worker_plugin_name }} version={{ smart_generic_worker_plugin_version | default('latest') }} group_id={{ smart_generic_worker_plugin_group_id }} extension={{ smart_generic_worker_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ smart_generic_worker_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ smart_generic_worker_plugin_file }} - register: generic_worker_download - - - name: Remove the old accounting aggregator plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ smart_generic_worker_plugin_name }}-*-jar-with-dependencies.jar - when: generic_worker_download is changed - - - name: Copy the accounting aggregator plugin to its final destination - copy: src={{ smartgears_downloads_dir }}/{{ smart_generic_worker_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ smart_generic_worker_plugin_file }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: generic_worker_install - tags: [ 'smartgears', 'generic_worker', 'tomcat' ] - - diff --git a/smartgears/geonetwork_connector/defaults/main.yml b/smartgears/geonetwork_connector/defaults/main.yml deleted file mode 100644 index 4607ee06..00000000 --- a/smartgears/geonetwork_connector/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -gcube_geonetwork_connector_install: False -gcube_geonetwork_connector_ver: latest -gcube_geonetwork_connector_name: gcube-geonetwork-connector -gcube_geonetwork_connector_group_id: org.gcube.data.access.geonetwork -gcube_geonetwork_connector_extension: jar -gcube_geonetwork_connector_file: '{{ gcube_geonetwork_connector_name }}-{{ gcube_geonetwork_connector_ver }}.{{ gcube_geonetwork_connector_extension }}' diff --git a/smartgears/geonetwork_connector/tasks/main.yml b/smartgears/geonetwork_connector/tasks/main.yml deleted file mode 100644 index be86a0e1..00000000 --- a/smartgears/geonetwork_connector/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- block: - - name: Remove the installed gcube geonetwork connector if we want to remove the service - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ geonetwork_app_name | lower }}/WEB-INF/lib/{{ gcube_geonetwork_connector_name }}*.jar - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not gcube_geonetwork_connector_install - tags: [ 'smartgears', 'geonetwork', 'gcube_geonetwork_connector', 'tomcat' ] - -- block: - - name: Get the gcube geonetwork connector - maven_artifact: artifact_id={{ gcube_geonetwork_connector_name }} version={{ gcube_geonetwork_connector_version | default(omit) }} group_id={{ gcube_geonetwork_connector_group_id }} extension={{ gcube_geonetwork_connector_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ gcube_geonetwork_connector_file }} verify_checksum=always - register: gcube_conn_download - - - name: Remove the installed gcube geonetwork connector before upgrading - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ geonetwork_app_name | lower }}/WEB-INF/lib/{{ gcube_geonetwork_connector_name }}*.jar - when: gcube_conn_download is changed - notify: Restart smartgears - - - name: Copy the gcube geonetwork connector to its destination - copy: src={{ smartgears_downloads_dir }}/{{ gcube_geonetwork_connector_file }} dest={{ smartgears_instance_path }}/webapps/{{ geonetwork_app_name | lower }}/WEB-INF/lib/{{ gcube_geonetwork_connector_name }}.{{ gcube_geonetwork_connector_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: gcube_geonetwork_connector_install - tags: [ 'smartgears', 'geonetwork', 'gcube_geonetwork_connector', 'tomcat' ] diff --git a/smartgears/geoserver_connector/defaults/main.yml b/smartgears/geoserver_connector/defaults/main.yml deleted file mode 100644 index d40134d5..00000000 --- a/smartgears/geoserver_connector/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -gcube_geoserver_connector_install: False -gcube_geoserver_connector_upgrade: False -gcube_geoserver_connector_ver: latest -gcube_geoserver_connector_name: gcube-geoserver-connector -gcube_geoserver_connector_group_id: org.gcube.data.access.geoserver -gcube_geoserver_connector_extension: jar -gcube_geoserver_connector_file: '{{ gcube_geoserver_connector_name }}-{{ gcube_geoserver_connector_ver }}.{{ gcube_geoserver_connector_extension }}' diff --git a/smartgears/geoserver_connector/tasks/main.yml b/smartgears/geoserver_connector/tasks/main.yml deleted file mode 100644 index 42791423..00000000 --- a/smartgears/geoserver_connector/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- block: - - name: Remove the installed gcube geoserver connector before upgrading - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/{{ gcube_geoserver_connector_name }}*.jar - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not gcube_geoserver_connector_install - tags: [ 'smartgears', 'geoserver', 'gcube_geoserver_connector', 'tomcat' ] - -- block: - - name: Get the gcube connector - maven_artifact: artifact_id={{ gcube_geoserver_connector_name }} version={{ gcube_geoserver_connector_version | default(omit) }} group_id={{ gcube_geoserver_connector_group_id }} extension={{ gcube_geoserver_connector_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ gcube_geoserver_connector_file }} verify_checksum=always - register: gcube_conn_download - - - name: Remove the installed gcube geoserver connector before upgrading - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/{{ gcube_geoserver_connector_name }}*.jar - when: gcube_conn_download is changed - notify: Restart smartgears - - - name: Copy the gcube geoserver connector to its destination - copy: src={{ smartgears_downloads_dir }}/{{ gcube_geoserver_connector_file }} dest={{ smartgears_instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/{{ gcube_geoserver_connector_name }}.{{ gcube_geoserver_connector_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: gcube_geoserver_connector_install - tags: [ 'smartgears', 'geoserver', 'gcube_geoserver_connector', 'tomcat' ] diff --git a/smartgears/gfeed_service/defaults/main.yml b/smartgears/gfeed_service/defaults/main.yml deleted file mode 100644 index 5371725e..00000000 --- a/smartgears/gfeed_service/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -gfeed_service_install: False -gfeed_service_upgrade: False -gfeed_service_version: latest -gfeed_service_name: gCat-Feeder - -gfeed_group_id: org.gcube.data-publishing.gCat-Feeder -gfeed_extension: war -gfeed_service_file: '{{ gfeed_service_name }}-{{ gfeed_service_version }}.{{ gfeed_extension }}' - diff --git a/smartgears/gfeed_service/meta/main.yml b/smartgears/gfeed_service/meta/main.yml deleted file mode 100644 index 789ff138..00000000 --- a/smartgears/gfeed_service/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - { role: '../../library/roles/smartgears/catalina-app-conf' } - diff --git a/smartgears/gfeed_service/tasks/main.yml b/smartgears/gfeed_service/tasks/main.yml deleted file mode 100644 index 6dbe3eb1..00000000 --- a/smartgears/gfeed_service/tasks/main.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- block: - - name: Remove the old gfeed files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}.{{ gfeed_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not gfeed_service_install - tags: [ 'gfeed_service' ] - -- block: - - name: Get the gfeed-service - maven_artifact: artifact_id={{ gfeed_service_name }} version={{ gfeed_service_version | default('latest') }} group_id={{ gfeed_group_id }} extension={{ gfeed_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ gfeed_service_file }} verify_checksum=always - register: gfeed_service_download - - - name: Remove the old gfeed files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }}.{{ gfeed_extension }}' - when: gfeed_service_download is changed - - - name: Create the gFeed webapp directory - file: dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }} state=directory - when: gfeed_service_download - - - name: Unarchive the gFeed war file - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ gfeed_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ gfeed_service_name }} - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: gfeed_service_install - tags: [ 'gfeed_service' ] - diff --git a/smartgears/gis_viewer_app/defaults/main.yml b/smartgears/gis_viewer_app/defaults/main.yml deleted file mode 100644 index 248129b0..00000000 --- a/smartgears/gis_viewer_app/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -gis_viewer_install: False -gis_viewer_upgrade: False -gis_viewer_version: latest -gis_viewer_name: gis-viewer-app - -gis_viewer_group_id: org.gcube.portlets.user -gis_viewer_extension: war -gis_viewer_file: '{{ gis_viewer_name }}-{{ gis_viewer_version }}.{{ gis_viewer_extension }}' - diff --git a/smartgears/gis_viewer_app/tasks/main.yml b/smartgears/gis_viewer_app/tasks/main.yml deleted file mode 100644 index eedc2766..00000000 --- a/smartgears/gis_viewer_app/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old gis_viewer files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ gis_viewer_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ gis_viewer_name }}.{{ gis_viewer_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not gis_viewer_install - tags: [ 'smartgears', 'gis_viewer', 'tomcat' ] - -- block: - - name: Get the gis_viewer-service - maven_artifact: artifact_id={{ gis_viewer_name }} version={{ gis_viewer_version | default('latest') }} group_id={{ gis_viewer_group_id }} extension={{ gis_viewer_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ gis_viewer_file }} verify_checksum=always - register: gis_viewer_download - - - name: Remove the old gis_viewer files - file: path={{ smartgears_instance_path }}/webapps/{{ gis_viewer_name }} state=absent - when: gis_viewer_download is changed - - - name: Copy the gis_viewer service war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ gis_viewer_file }} dest={{ smartgears_instance_path }}/webapps/{{ gis_viewer_name }}.{{ gis_viewer_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: gis_viewer_install - tags: [ 'smartgears', 'gis_viewer', 'tomcat' ] - diff --git a/smartgears/grsf_api/defaults/main.yml b/smartgears/grsf_api/defaults/main.yml deleted file mode 100644 index 53351645..00000000 --- a/smartgears/grsf_api/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -grsf_api_install: False -grsf_api_ver: latest -grsf_api_group_id: gr.forth.ics.isl -grsf_api_name: grsf-api -grsf_api_extension: war -grsf_api_file: '{{ grsf_api_name }}-{{ grsf_api_ver }}.{{ grsf_api_extension }}' diff --git a/smartgears/grsf_api/tasks/main.yml b/smartgears/grsf_api/tasks/main.yml deleted file mode 100644 index 5dc74348..00000000 --- a/smartgears/grsf_api/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- block: - - name: Remove the old grsf-api files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ grsf_api_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ grsf_api_name }}.{{ grsf_api_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'grsf_api', 'tomcat' ] - when: not grsf_api_install - -- block: - - name: Get the grsf-api war - maven_artifact: artifact_id={{ grsf_api_name }} version={{ grsf_api_version | default(omit) }} group_id={{ grsf_api_group_id }} extension={{ grsf_api_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ grsf_api_file }} - register: grsf_api_download - - - name: Remove the old grsf-api files - file: path={{ smartgears_instance_path }}/webapps/{{ grsf_api_name }} state=absent - notify: Restart smartgears - when: grsf_api_download is changed - - - name: Copy the GRSF api war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ grsf_api_file }} dest={{ smartgears_instance_path }}/webapps/{{ grsf_api_name }}.{{ grsf_api_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'grsf_api', 'tomcat' ] - when: grsf_api_install diff --git a/smartgears/grsf_publisher_ws/defaults/main.yml b/smartgears/grsf_publisher_ws/defaults/main.yml deleted file mode 100644 index 0ba17b36..00000000 --- a/smartgears/grsf_publisher_ws/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -grsf_publisher_ws_install: False -grsf_publisher_ws_ver: latest -grsf_publisher_ws_group_id: org.gcube.data-catalogue -grsf_publisher_ws_name: grsf-publisher-ws -grsf_publisher_ws_extension: war -grsf_publisher_ws_file: '{{ grsf_publisher_ws_name }}-{{ grsf_publisher_ws_ver }}.{{ grsf_publisher_ws_extension }}' diff --git a/smartgears/grsf_publisher_ws/tasks/main.yml b/smartgears/grsf_publisher_ws/tasks/main.yml deleted file mode 100644 index e85cf617..00000000 --- a/smartgears/grsf_publisher_ws/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- block: - - name: Remove the old grsf-publisher-ws files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ grsf_publisher_ws_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ grsf_publisher_ws_name }}.{{ grsf_publisher_ws_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'grsf_publisher_ws' ] - when: not grsf_publisher_ws_install - -- block: - - name: Get the grsf-publisher-ws war - maven_artifact: artifact_id={{ grsf_publisher_ws_name }} version={{ grsf_publisher_ws_ver | default(omit) }} group_id={{ grsf_publisher_ws_group_id }} extension={{ grsf_publisher_ws_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ grsf_publisher_ws_file }} verify_checksum=always - register: grsf_publisher_download - - - name: Remove the old grsf-publisher-ws files - file: path={{ smartgears_instance_path }}/webapps/{{ grsf_publisher_ws_name }} state=absent - notify: Restart smartgears - when: grsf_publisher_download is changed - - - name: Copy the GRSF publisher under the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ grsf_publisher_ws_file }} dest={{ smartgears_instance_path }}/webapps/{{ grsf_publisher_ws_name }}.{{ grsf_publisher_ws_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'grsf_publisher_ws' ] - when: grsf_publisher_ws_install diff --git a/smartgears/grsf_services_updater/defaults/main.yml b/smartgears/grsf_services_updater/defaults/main.yml deleted file mode 100644 index c7e883d6..00000000 --- a/smartgears/grsf_services_updater/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -grsf_services_updater_install: False -grsf_services_updater_ver: latest -grsf_services_updater_group_id: gr.forth.ics.isl -grsf_services_updater_name: grsf-services-updater -grsf_services_updater_extension: war -grsf_services_updater_file: '{{ grsf_services_updater_name }}-{{ grsf_services_updater_ver }}.{{ grsf_services_updater_extension }}' diff --git a/smartgears/grsf_services_updater/tasks/main.yml b/smartgears/grsf_services_updater/tasks/main.yml deleted file mode 100644 index 75625759..00000000 --- a/smartgears/grsf_services_updater/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- block: - - name: Remove the old grsf-services-updater files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ grsf_services_updater_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ grsf_services_updater_name }}.{{ grsf_services_updater_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'grsf_services_updater', 'tomcat' ] - when: not grsf_services_updater_install - -- block: - - name: Get the grsf-services-updater war - maven_artifact: artifact_id={{ grsf_services_updater_name }} version={{ grsf_services_updater_version | default(omit) }} group_id={{ grsf_services_updater_group_id }} extension={{ grsf_services_updater_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ grsf_services_updater_file }} - register: grsf_updater_download - - - name: Remove the old grsf-services-updater files - file: path={{ smartgears_instance_path }}/webapps/{{ grsf_services_updater_name }} state=absent - notify: Restart smartgears - when: grsf_updater_download is changed - - - name: Copy the GRSF services updater war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ grsf_services_updater_file }} dest={{ smartgears_instance_path }}/webapps/{{ grsf_services_updater_name }}.{{ grsf_services_updater_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'grsf_services_updater', 'tomcat' ] - when: grsf_services_updater_install diff --git a/smartgears/home_library/defaults/main.yml b/smartgears/home_library/defaults/main.yml deleted file mode 100644 index 4c31826a..00000000 --- a/smartgears/home_library/defaults/main.yml +++ /dev/null @@ -1,91 +0,0 @@ ---- -home_library_install: False -home_library_upgrade: False -home_library_version: latest -home_library_name: home-library-webapp - -home_library_group_id: org.gcube.data.access -home_library_extension: war -home_library_file: '{{ home_library_name }}-{{ home_library_version }}.{{ home_library_extension }}' - -# Standard jackrabbit configuration -# -jackrabbit_data_dir: /data/jackrabbit - -jackrabbit_config_files: - - bootstrap.properties - - repository.xml - -jackrabbit_rmi_enabled: 'true' -jackrabbit_rmi_host: 'localhost' -jackrabbit_rmi_port: 0 -jackrabbit_repository_config: 'jackrabbit/repository.xml' -jackrabbit_repository_name: 'jackrabbit.repository' -jackrabbit_jndi_enabled: 'true' - -jackrabbit_db_type: 'postgresql' -jackrabbit_db_driver: 'org.postgresql.Driver' -jackrabbit_db_host: 'localhost' - -jackrabbit_virt_fs_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_virt_fs_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_virt_fs_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_virt_fs_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_virt_fs_db_name: 'workspace-db' -jackrabbit_virt_fs_db_user: 'workspace-db-user' -#jackrabbit_virt_fs_db_password: '' -jackrabbit_virt_fs_db_url: 'jdbc:{{ jackrabbit_virt_fs_db_type }}://{{ jackrabbit_virt_fs_db_host }}/{{ jackrabbit_virt_fs_db_name }}' - -# By default the data store uses the same database of the virtual filesystem -jackrabbit_data_store_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_data_store_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_data_store_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_data_store_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_data_store_db_name: '{{ jackrabbit_virt_fs_db_name }}' -jackrabbit_data_store_db_user: '{{ jackrabbit_virt_fs_db_user }}' -jackrabbit_data_store_db_password: '{{ jackrabbit_virt_fs_db_password }}' -jackrabbit_data_store_db_url: 'jdbc:{{ jackrabbit_data_store_db_type }}://{{ jackrabbit_data_store_db_host }}/{{ jackrabbit_data_store_db_name }}' -jackrabbit_data_store_db_tableprefix: 'datastore_' - -jackrabbit_security_adminid: 'jr_admin' -#jackrabbit_security_admin_pwd: '' - -jackrabbit_ws_default_workspace: 'default' - -jackrabbit_ws_persistence_manager: 'org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager' -jackrabbit_ws_persistence_manager_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_ws_persistence_manager_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_ws_persistence_manager_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_ws_persistence_manager_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_ws_persistence_manager_db_name: '{{ jackrabbit_virt_fs_db_name }}' -jackrabbit_ws_persistence_manager_db_user: '{{ jackrabbit_virt_fs_db_user }}' -jackrabbit_ws_persistence_manager_db_password: '{{ jackrabbit_virt_fs_db_password }}' -jackrabbit_ws_persistence_manager_db_url: 'jdbc:{{ jackrabbit_ws_persistence_manager_db_type }}://{{ jackrabbit_ws_persistence_manager_db_host }}/{{ jackrabbit_ws_persistence_manager_db_name }}' -jackrabbit_ws_persistence_manager_db_tableprefix: 'pm_${wsp.name}_' - -jackrabbit_ver_persistence_manager: 'org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager' -jackrabbit_ver_persistence_manager_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_ver_persistence_manager_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_ver_persistence_manager_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_ver_persistence_manager_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_ver_persistence_manager_db_name: '{{ jackrabbit_virt_fs_db_name }}' -jackrabbit_ver_persistence_manager_db_user: '{{ jackrabbit_virt_fs_db_user }}' -jackrabbit_ver_persistence_manager_db_password: '{{ jackrabbit_virt_fs_db_password }}' -jackrabbit_ver_persistence_manager_db_url: 'jdbc:{{ jackrabbit_ver_persistence_manager_db_type }}://{{ jackrabbit_ver_persistence_manager_db_host }}/{{ jackrabbit_ver_persistence_manager_db_name }}' -jackrabbit_ver_persistence_manager_db_tableprefix: 'pm_version_' - -# Cluster configuration. Same db host by default, different DB -jackrabbit_cluster_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_cluster_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_cluster_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_cluster_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_cluster_db_name: 'ws-db-cluster-journal' -jackrabbit_cluster_db_user: 'ws-db-journal-user' -# jackrabbit_cluster_db_password: '' -jackrabbit_cluster_db_url: 'jdbc:{{ jackrabbit_cluster_db_type }}://{{ jackrabbit_cluster_db_host }}/{{ jackrabbit_cluster_db_name }}' -jackrabbit_cluster_db_tableprefix: 'journal_' -jackrabbit_cluster_node_id: '{{ ansible_fqdn }}' -# Set it to true if we want to clean the journal daily -jackrabbit_cluster_janitor_enabled: 'false' - - diff --git a/smartgears/home_library/tasks/main.yml b/smartgears/home_library/tasks/main.yml deleted file mode 100644 index 782852e3..00000000 --- a/smartgears/home_library/tasks/main.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- block: - - name: Remove the installed home library whe we do not want it installed - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ home_library_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ home_library_name }}.war' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not home_library_install - tags: [ 'smartgears', 'home_library', 'tomcat' ] - -- block: - - maven_artifact: artifact_id={{ home_library_name }} version={{ home_library_version | default(omit) }} group_id={{ home_library_group_id }} extension={{ home_library_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ home_library_file }} verify_checksum=always - register: home_library_download - - - name: Remove the installed home library before upgrading - file: dest={{ smartgears_instance_path }}/webapps/{{ home_library_name }} state=absent - when: home_library_download is changed - notify: Restart smartgears - - - name: Copy the home library war - copy: src={{ smartgears_downloads_dir }}/{{ home_library_file }} dest={{ smartgears_instance_path }}/webapps/{{ home_library_name }}.{{ home_library_extension | default('war') }} remote_src=yes force=yes - notify: Restart smartgears - - - name: Create the JackRabbit persistence directory - become_user: root - file: dest={{ jackrabbit_data_dir }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Verify if the JackRabbit persistence directory is in the place where the service expects it - stat: path={{ smartgears_instance_path }}/jackrabbit - register: jackrabbit_data_path - - - name: Link the data dir to the place where jackrabbit expects it - file: src={{ jackrabbit_data_dir }} dest={{ smartgears_instance_path }}/jackrabbit state=link - when: not jackrabbit_data_path.stat.exists - - - name: Install the repository configuration files - template: src={{ item }}.j2 dest={{ jackrabbit_data_dir }}/{{ item }} - with_items: '{{ jackrabbit_config_files }}' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: home_library_install - tags: [ 'smartgears', 'home_library', 'tomcat' ] - diff --git a/smartgears/home_library/templates/bootstrap.properties.j2 b/smartgears/home_library/templates/bootstrap.properties.j2 deleted file mode 100644 index 6dbe7b0a..00000000 --- a/smartgears/home_library/templates/bootstrap.properties.j2 +++ /dev/null @@ -1,11 +0,0 @@ -#bootstrap properties for the repository startup servlet. -#Fri Jul 21 05:19:29 CEST 2017 -java.naming.factory.initial=org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory -repository.home=jackrabbit -rmi.enabled={{ jackrabbit_rmi_enabled }} -repository.config={{ jackrabbit_repository_config }} -repository.name={{ jackrabbit_repository_name }} -rmi.host={{ jackrabbit_rmi_host }} -java.naming.provider.url=http\://www.apache.org/jackrabbit -jndi.enabled={{ jackrabbit_jndi_enabled }} -rmi.port={{ jackrabbit_rmi_port }} diff --git a/smartgears/home_library/templates/repository.xml.j2 b/smartgears/home_library/templates/repository.xml.j2 deleted file mode 100644 index 3621370e..00000000 --- a/smartgears/home_library/templates/repository.xml.j2 +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/smartgears/http-proxy-servlet/defaults/main.yml b/smartgears/http-proxy-servlet/defaults/main.yml deleted file mode 100644 index 5cea2c10..00000000 --- a/smartgears/http-proxy-servlet/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -http_proxy_servlet_install: False -maven_central_base_url: 'https://repo1.maven.org/maven2' -http_proxy_servlet_ver: latest -http_proxy_servlet_group_id: org.mitre.dsmiley.httpproxy -http_proxy_servlet_name: smiley-http-proxy-servlet -http_proxy_servlet_extension: jar -http_proxy_servlet_file: '{{ http_proxy_servlet_name }}-{{ http_proxy_servlet_ver }}.{{ http_proxy_servlet_extension }}' diff --git a/smartgears/http-proxy-servlet/tasks/main.yml b/smartgears/http-proxy-servlet/tasks/main.yml deleted file mode 100644 index 52ca1417..00000000 --- a/smartgears/http-proxy-servlet/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- block: - - name: Remove the old http-proxy-servlet files - file: path='{{ smartgears_instance_path }}/{{ http_proxy_servlet_name }}.{{ http_proxy_servlet_extension }}' state=absent - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'http_proxy_servlet', 'tomcat' ] - when: not http_proxy_servlet_install - -- block: - - name: Get the http-proxy-servlet jar - maven_artifact: artifact_id={{ http_proxy_servlet_name }} version={{ http_proxy_servlet_version | default(omit) }} group_id='{{ http_proxy_servlet_group_id }}' extension={{ http_proxy_servlet_extension | default('war') }} repository_url={{ maven_central_base_url }} dest={{ smartgears_downloads_dir }}/{{ http_proxy_servlet_file }} verify_checksum=always - register: http_proxy_servlet_download - - - name: Remove the old http-proxy-servlet files - file: path='{{ smartgears_instance_path }}/{{ http_proxy_servlet_name }}.{{ http_proxy_servlet_extension }}' state=absent - notify: Restart smartgears - when: http_proxy_servlet_download is changed - - - name: Copy the http-proxy-servlet war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ http_proxy_servlet_file }} dest={{ smartgears_instance_path }}/lib/{{ http_proxy_servlet_name }}.{{ http_proxy_servlet_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'http_proxy_servlet', 'tomcat' ] - when: http_proxy_servlet_install diff --git a/smartgears/ic_proxy/defaults/main.yml b/smartgears/ic_proxy/defaults/main.yml deleted file mode 100644 index b613d6ee..00000000 --- a/smartgears/ic_proxy/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -ic_proxy_install: False -ic_proxy_allscopes: False -ic_proxy_version: latest -ic_proxy_name: icproxy -ic_proxy_group_id: org.gcube.information-system -ic_proxy_extension: war -ic_proxy_file: '{{ ic_proxy_name }}-{{ ic_proxy_version }}.{{ ic_proxy_extension }}' - diff --git a/smartgears/ic_proxy/tasks/main.yml b/smartgears/ic_proxy/tasks/main.yml deleted file mode 100644 index 392e983a..00000000 --- a/smartgears/ic_proxy/tasks/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- block: - - name: Remove the old ic_proxy files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }}.{{ ic_proxy_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not ic_proxy_install - tags: [ 'smartgears', 'ic_proxy', 'tomcat' ] - -- block: - - name: Get the ic_proxy war - maven_artifact: artifact_id={{ ic_proxy_name }} version={{ ic_proxy_version | default('latest') }} group_id={{ ic_proxy_group_id }} extension={{ ic_proxy_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ ic_proxy_file }} - register: ic_proxy_download - - - name: Remove the old ic_proxy files - file: path={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }} state=absent - when: ic_proxy_download is changed - - - name: Create the ic proxy working directory - file: path={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Copy the ic_proxy war into the webapps dir - copy: src={{ smartgears_downloads_dir }}/{{ ic_proxy_file }} dest={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }}.{{ ic_proxy_extension }} remote_src=yes force=yes - notify: Restart smartgears - - - name: Unarchive the ic_proxy war - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ ic_proxy_file }} dest={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }} creates={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }}/WEB-INF/lib - notify: Restart smartgears - - - name: Fix the exclude tag in gcube-app.xml - template: src=gcube-app.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }}/WEB-INF/gcube-app.xml owner={{ d4science_user }} group={{ d4science_user }} - notify: Restart smartgears - when: ic_proxy_allscopes - - become: True - become_user: '{{ d4science_user }}' - when: ic_proxy_install - tags: [ 'smartgears', 'ic_proxy', 'tomcat' ] diff --git a/smartgears/ic_proxy/templates/gcube-app.xml.j2 b/smartgears/ic_proxy/templates/gcube-app.xml.j2 deleted file mode 100644 index 7c09652b..00000000 --- a/smartgears/ic_proxy/templates/gcube-app.xml.j2 +++ /dev/null @@ -1,13 +0,0 @@ - - ICProxy - InformationSystem - 1.1.1-4.4.0-142273 - icproxy webapp - - - /ServiceEndpoint/* - /* - - diff --git a/smartgears/is_exporter_se_plugin/defaults/main.yml b/smartgears/is_exporter_se_plugin/defaults/main.yml deleted file mode 100644 index 931e4573..00000000 --- a/smartgears/is_exporter_se_plugin/defaults/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -is_exporter_se_plugin_install: False -is_exporter_se_plugin_upgrade: False -is_exporter_se_plugin_version: latest - -is_exporter_se_plugin_group_id: 'org.gcube.information-system' -is_exporter_se_plugin_name: 'is-exporter-se-plugin' -is_exporter_se_plugin_extension: 'jar' -is_exporter_se_plugin_classifier: 'uberjar' -is_exporter_se_plugin_uber_file: '{{ is_exporter_se_plugin_name }}-{{ is_exporter_se_plugin_version }}-{{ is_exporter_se_plugin_classifier }}.{{ is_exporter_se_plugin_extension }}' -is_exporter_se_plugin_file: '{{ is_exporter_se_plugin_name }}-{{ is_exporter_se_plugin_version }}.{{ is_exporter_se_plugin_extension }}' - -catalina_apps_conf: - - { app_name: '{{ smart_executor_name }}', plugin_name: '{{ is_exporter_se_plugin_name }}' } - -# Note: the deb package nco is required diff --git a/smartgears/is_exporter_se_plugin/meta/main.yml b/smartgears/is_exporter_se_plugin/meta/main.yml deleted file mode 100644 index 2510b86d..00000000 --- a/smartgears/is_exporter_se_plugin/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: '../library/roles/smartgears/catalina-app-conf' - diff --git a/smartgears/is_exporter_se_plugin/tasks/main.yml b/smartgears/is_exporter_se_plugin/tasks/main.yml deleted file mode 100644 index be467665..00000000 --- a/smartgears/is_exporter_se_plugin/tasks/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- block: - - name: Remove the is_exporter smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ is_exporter_se_plugin_name }} state=absent - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not is_exporter_se_plugin_install - tags: [ 'smartgears', 'is_exporter_se', 'tomcat' ] - - -- block: - - name: Download the is_exporter plugin uber jar - maven_artifact: artifact_id={{ is_exporter_se_plugin_name }} version={{ is_exporter_se_plugin_version | default('latest') }} group_id={{ is_exporter_se_plugin_group_id }} extension={{ is_exporter_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ is_exporter_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ is_exporter_se_plugin_uber_file }} - register: is_exporter_download - - - name: Remove the old is_exporter smart executor plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ is_exporter_se_plugin_name }} state=absent - when: is_exporter_download is changed - notify: Restart smartgears - - - name: Create the plugin directory inside the smart executor - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ is_exporter_se_plugin_name }} state=directory - register: is_exporter_create_dir - - - name: Unarchive the is_exporter uber jar to expose its libraries - unarchive: src={{ smartgears_downloads_dir }}/{{ is_exporter_se_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ is_exporter_se_plugin_name }}/ copy=no - when: is_exporter_create_dir is changed - notify: Restart smartgears - - - name: Download the is_exporter plugin jar file - maven_artifact: artifact_id={{ is_exporter_se_plugin_name }} version={{ is_exporter_se_plugin_version }} group_id={{ is_exporter_se_plugin_group_id }} extension={{ is_exporter_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ is_exporter_se_plugin_name }} keep_name=yes - notify: Restart smartgears - - - name: Remove the IS exporter uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/plugins/{{ is_exporter_se_plugin_name }}/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - - name: Install the nco package - become_user: root - apt: pkg=nco state=present update_cache=yes cache_valid_time=1800 - - become: True - become_user: '{{ smartgears_user }}' - when: is_exporter_se_plugin_install - tags: [ 'smartgears', 'is_exporter_se', 'tomcat' ] diff --git a/smartgears/is_sweeper_se_plugin/defaults/main.yml b/smartgears/is_sweeper_se_plugin/defaults/main.yml deleted file mode 100644 index 433868df..00000000 --- a/smartgears/is_sweeper_se_plugin/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -is_sweeper_se_plugin_install: False -is_sweeper_se_plugin_upgrade: False -is_sweeper_se_plugin_version: latest - -is_sweeper_se_plugin_group_id: 'org.gcube.information-system' -is_sweeper_se_plugin_name: 'is-sweeper-se-plugin' -is_sweeper_se_plugin_extension: 'jar' -is_sweeper_se_plugin_classifier: 'jar-with-dependencies' -is_sweeper_se_plugin_file: '{{ is_sweeper_se_plugin_name }}-{{ is_sweeper_se_plugin_version }}-jar-with-dependencies.{{ is_sweeper_se_plugin_extension }}' diff --git a/smartgears/is_sweeper_se_plugin/tasks/main.yml b/smartgears/is_sweeper_se_plugin/tasks/main.yml deleted file mode 100644 index b7d73dcb..00000000 --- a/smartgears/is_sweeper_se_plugin/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- block: - - name: Remove the old is-sweeper plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ is_sweeper_se_plugin_name }}-*-{{ is_sweeper_se_plugin_classifier }}.{{ is_sweeper_se_plugin_extension }} - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not is_sweeper_se_plugin_install - tags: [ 'smartgears', 'is_sweeper_se', 'tomcat' ] - -- block: - - name: Download the is-sweeper plugin - maven_artifact: artifact_id={{ is_sweeper_se_plugin_name }} version={{ is_sweeper_se_plugin_version | default('latest') }} group_id={{ is_sweeper_se_plugin_group_id }} extension={{ is_sweeper_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ is_sweeper_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ is_sweeper_se_plugin_file }} - register: is_sweeper_plugin_download - - - name: Remove the old is-sweeper plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ is_sweeper_se_plugin_name }}-*-{{ is_sweeper_se_plugin_classifier }}.{{ is_sweeper_se_plugin_extension }} - when: is_sweeper_plugin_download is changed - - - name: Install the is-sweeper plugin inside the smart executor lib directory - copy: src={{ smartgears_downloads_dir }}/{{ is_sweeper_se_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ is_sweeper_se_plugin_file }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: is_sweeper_se_plugin_install - tags: [ 'smartgears', 'is_sweeper_se', 'tomcat' ] - diff --git a/smartgears/java_reverse_proxy/defaults/main.yml b/smartgears/java_reverse_proxy/defaults/main.yml deleted file mode 100644 index d007f450..00000000 --- a/smartgears/java_reverse_proxy/defaults/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -java_rproxy_service_install: False -java_rproxy_service_version: latest -java_rproxy_service_name: reverse-proxy -java_rproxy_group_id: org.gcube.portal.rproxy -java_rproxy_service_extension: war -java_rproxy_service_file: '{{ java_rproxy_service_name }}-{{ java_rproxy_service_version }}.{{ java_rproxy_service_extension }}' -smartgears_rproxy_base_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots' - -java_rproxy_servlet_name: 'ReverseProxy' -java_rproxy_target_uri: 'https://revproxied-app.example.org/' -java_rproxy_url_partterns: - - '/dest1/*' - - '/dest2/*' -java_rproxy_display_name: 'Java Reverse Proxy Service' -java_rproxy_targets: - - { servlet_name: '{{ java_rproxy_servlet_name }}', target_uri: '{{ java_rproxy_target_uri }}', log: 'true', forwardip: 'true', preserve_host: 'true', preserve_cookies: 'true', handle_redirects: 'true', socket_timeout: '60000', read_timeout: '60000', url_patterns: [ '{{ java_rproxy_url_partterns }}' ] } - diff --git a/smartgears/java_reverse_proxy/tasks/main.yml b/smartgears/java_reverse_proxy/tasks/main.yml deleted file mode 100644 index f33d3060..00000000 --- a/smartgears/java_reverse_proxy/tasks/main.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- block: - - name: Remove the old java_rproxy service files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }}.{{ java_rproxy_service_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not java_rproxy_service_install - tags: [ 'smartgears', 'java_rproxy_service', 'tomcat' ] - -- block: - - name: Get the java_rproxy-service war - #maven_artifact: artifact_id={{ java_rproxy_service_name }} version={{ java_rproxy_service_version | default(omit) }} group_id={{ java_rproxy_group_id }} extension={{ java_rproxy_service_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ java_rproxy_service_file }} verify_checksum=always - maven_artifact: artifact_id={{ java_rproxy_service_name }} version={{ java_rproxy_service_version | default(omit) }} group_id={{ java_rproxy_group_id }} extension={{ java_rproxy_service_extension | default('war') }} repository_url={{ smartgears_rproxy_base_url }} dest={{ smartgears_downloads_dir }}/{{ java_rproxy_service_file }} verify_checksum=always - register: java_rproxy_service_download - - - name: Remove the old java_rproxy service files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }}.{{ java_rproxy_service_extension }}' - notify: Restart smartgears - when: java_rproxy_service_download is changed - - - name: Create the java_rproxy webapp directory - file: dest={{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }} state=directory - when: java_rproxy_service_download is changed - - - name: Unarchive the java_rproxy war file - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ java_rproxy_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }} - args: - creates: '{{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }}/WEB-INF/web.xml' - notify: Restart smartgears - - - name: Install the java_rproxy web.xml template - template: src=web.xml dest={{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }}/WEB-INF/web.xml mode=0440 - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: java_rproxy_service_install - tags: [ 'smartgears', 'java_rproxy_service', 'tomcat' ] diff --git a/smartgears/java_reverse_proxy/templates/web.xml b/smartgears/java_reverse_proxy/templates/web.xml deleted file mode 100644 index e2f6ffb2..00000000 --- a/smartgears/java_reverse_proxy/templates/web.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - {{ java_rproxy_display_name }} - {% for servlet in java_rproxy_targets %} - - {{ servlet.servlet_name }} - org.mitre.dsmiley.httpproxy.ProxyServlet - - targetUri - {{ servlet. target_uri }} - - - log - {{ servlet.log }} - - - forwardip - {{ servlet.forwardip }} - - - preserveHost - {{ servlet.preserve_host }} - - - preserveCookies - {{ servlet.preserve_cookies }} - - - http.protocol.handle-redirects - {{ servlet.handle_redirects }} - - - http.socket.timeout - {{ servlet.socket_timeout }} - - - http.read.timeout - {{ servlet.read_timeout }} - - - - {{ servlet.servlet_name }} - {% for pattern in servlet.url_patterns %} - {{ pattern }} - {% endfor %} - - {% endfor %} - diff --git a/smartgears/meteodataimporter_se_plugin/defaults/main.yml b/smartgears/meteodataimporter_se_plugin/defaults/main.yml deleted file mode 100644 index a445fbb0..00000000 --- a/smartgears/meteodataimporter_se_plugin/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -meteodataimporter_se_plugin_install: False -meteodataimporter_se_plugin_upgrade: False -meteodataimporter_se_plugin_name: meteo-data-importer-with-dependencies.jar -meteodataimporter_se_plugin_url: 'http://data.d4science.org/WVlscHM4bWNVTlJrd05NNWIrSFpaRlo1QWgrbUw2UllHbWJQNStIS0N6Yz0' diff --git a/smartgears/meteodataimporter_se_plugin/tasks/main.yml b/smartgears/meteodataimporter_se_plugin/tasks/main.yml deleted file mode 100644 index b27099a9..00000000 --- a/smartgears/meteodataimporter_se_plugin/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- block: - - name: Remove the old meteodataimporter - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ item }} - with_items: - - '{{ meteodataimporter_se_plugin_name }}' - when: meteodataimporter_se_plugin_upgrade - - - name: Get the meteodataimporter smart executor plugin - get_url: url={{ meteodataimporter_se_plugin_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ meteodataimporter_se_plugin_name }} - when: meteodataimporter_se_plugin_install - notify: Restart smartgears - tags: [ 'smartgears', 'meteodataimporter_se', 'tomcat' ] - - become: True - become_user: '{{ smartgears_user }}' - when: meteodataimporter_se_plugin_install - tags: [ 'smartgears', 'meteodataimporter_se', 'tomcat' ] diff --git a/smartgears/oscar_importer_se_plugin/defaults/main.yml b/smartgears/oscar_importer_se_plugin/defaults/main.yml deleted file mode 100644 index 7a922dbd..00000000 --- a/smartgears/oscar_importer_se_plugin/defaults/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -oscar_importer_se_plugin_install: False -oscar_importer_se_plugin_upgrade: False -oscar_importer_se_plugin_version: latest - -oscar_importer_se_plugin_group_id: 'org.gcube.dataanalysis' -oscar_importer_se_plugin_name: 'oscar-importer-se-plugin' -oscar_importer_se_plugin_extension: 'jar' -oscar_importer_se_plugin_classifier: 'jar-with-dependencies' -oscar_importer_se_plugin_file: '{{ oscar_importer_se_plugin_name }}-{{ oscar_importer_se_plugin_version }}-jar-with-dependencies.{{ oscar_importer_se_plugin_extension }}' - -# Note: the deb package libnetcdfc7 is required diff --git a/smartgears/oscar_importer_se_plugin/tasks/main.yml b/smartgears/oscar_importer_se_plugin/tasks/main.yml deleted file mode 100644 index d1c46751..00000000 --- a/smartgears/oscar_importer_se_plugin/tasks/main.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -- block: - - name: Remove the old oscar-importer plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_name }}-*-{{ oscar_importer_se_plugin_classifier }}.{{ oscar_importer_se_plugin_extension }} - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not oscar_importer_se_plugin_install - tags: [ 'smartgears', 'oscar_importer_se', 'tomcat' ] - -- block: - - name: Install the oscar-importer plugin inside the smart executor lib directory - maven_artifact: artifact_id={{ oscar_importer_se_plugin_name }} version={{ oscar_importer_se_plugin_version | default(omit) }} group_id={{ oscar_importer_se_plugin_group_id }} extension={{ oscar_importer_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ oscar_importer_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ oscar_importer_se_plugin_file }} - register: oscar_importer_download - - - name: Remove the old oscar-importer plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_name }}-*-{{ oscar_importer_se_plugin_classifier }}.{{ oscar_importer_se_plugin_extension }} - when: oscar_importer_download is changed - notify: Restart smartgears - - - name: Copy the oscar-importer plugin on the correct place - copy: src={{ smartgears_downloads_dir }}/{{ oscar_importer_se_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_file }} remote_src=yes force=yes - when: oscar_importer_download is changed - notify: Restart smartgears - - - name: Install the libnetcdfc7 package - become_user: root - apt: pkg=libnetcdfc7 state=present update_cache=yes cache_valid_time=1800 - - become: True - become_user: '{{ smartgears_user }}' - when: oscar_importer_se_plugin_install - tags: [ 'smartgears', 'oscar_importer_se', 'tomcat' ] diff --git a/smartgears/perform_service/defaults/main.yml b/smartgears/perform_service/defaults/main.yml deleted file mode 100644 index 9d4fd306..00000000 --- a/smartgears/perform_service/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -perform_service_install: False -perform_service_version: latest -smartgears_webapp_name: perform-service -perform_service_name: '{{ smartgears_webapp_name }}' -perform_group_id: org.gcube.application -perform_extension: war -perform_service_file: '{{ perform_service_name }}-{{ perform_service_version }}.{{ perform_extension }}' diff --git a/smartgears/perform_service/tasks/main.yml b/smartgears/perform_service/tasks/main.yml deleted file mode 100644 index f2077763..00000000 --- a/smartgears/perform_service/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old perform files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ perform_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ perform_service_name }}.{{ perform_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not perform_service_install - tags: [ 'perform_service' ] - -- block: - - name: Get the perform-service - maven_artifact: artifact_id={{ perform_service_name }} version={{ perform_service_version | default('latest') }} group_id={{ perform_group_id }} extension={{ perform_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ perform_service_file }} verify_checksum=always - register: perform_service_download - - - name: Remove the old perform files - file: path={{ smartgears_instance_path }}/webapps/{{ perform_service_name }} state=absent - when: perform_service_download is changed - - - name: Copy the perform war into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ perform_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ perform_service_name }}.{{ perform_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: perform_service_install - tags: [ 'perform_service' ] - diff --git a/smartgears/quota_se_plugin/defaults/main.yml b/smartgears/quota_se_plugin/defaults/main.yml deleted file mode 100644 index 9521706e..00000000 --- a/smartgears/quota_se_plugin/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -quota_se_plugin_install: False -quota_se_plugin_upgrade: False - -quota_se_plugin_name: accounting-insert-storage-se-plugin -quota_se_plugin_group_id: org.gcube.accounting -quota_se_plugin_version : latest -quota_se_plugin_artifact_id: accounting-insert-storage-se-plugin -quota_se_plugin_extension: jar -quota_se_plugin_classifier: jar-with-dependencies -quota_se_plugin_file: '{{ quota_se_plugin_name }}-{{ quota_se_plugin_version }}-{{ quota_se_plugin_classifier }}.{{ quota_se_plugin_extension }}' diff --git a/smartgears/quota_se_plugin/tasks/main.yml b/smartgears/quota_se_plugin/tasks/main.yml deleted file mode 100644 index 570bbbd2..00000000 --- a/smartgears/quota_se_plugin/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- block: - - name: Remove the old quota plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ quota_se_plugin_artifact_id }}-*-jar-with-dependencies.jar - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not quota_se_plugin_install - tags: [ 'smartgears', 'quota_se', 'tomcat' ] - -- block: - - name: Get the quota plugin and install it inside the smart executor - maven_artifact: artifact_id={{ quota_se_plugin_name }} version={{ quota_se_plugin_version | default(omit) }} group_id={{ quota_se_plugin_group_id }} extension={{ quota_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ quota_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ quota_se_plugin_file }} verify_checksum=always - register: quota_storage_download - - - name: Remove the old quota plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ quota_se_plugin_artifact_id }}-*-jar-with-dependencies.jar - when: quota_storage_download is changed - - - name: Copy the quota plugin to its final destination - copy: src={{ smartgears_downloads_dir }}/{{ quota_se_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ quota_se_plugin_file }} remote_src=yes - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: quota_se_plugin_install - tags: [ 'smartgears', 'quota_se', 'tomcat' ] - diff --git a/smartgears/quota_service/defaults/main.yml b/smartgears/quota_service/defaults/main.yml deleted file mode 100644 index 7d6b41e8..00000000 --- a/smartgears/quota_service/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -quota_service_install: False -quota_service_version: latest -quota_service_name: quota-manager -quota_group_id: org.gcube.resource.management -quota_service_extension: war -quota_service_file: '{{ quota_service_name }}-{{ quota_service_version }}.{{ quota_service_extension }}' - diff --git a/smartgears/quota_service/tasks/main.yml b/smartgears/quota_service/tasks/main.yml deleted file mode 100644 index 418c9804..00000000 --- a/smartgears/quota_service/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old quota service files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ quota_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ quota_service_name }}.{{ quota_service_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not quota_service_install - tags: [ 'smartgears', 'quota_service', 'tomcat' ] - -- block: - - name: Get the quota-service war - maven_artifact: artifact_id={{ quota_service_name }} version={{ quota_service_version | default(omit) }} group_id={{ quota_group_id }} extension={{ quota_service_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ quota_service_file }} verify_checksum=always - register: quota_service_download - - - name: Remove the old quota service files - file: path={{ smartgears_instance_path }}/webapps/{{ quota_service_name }} state=absent - when: quota_service_download is changed - - - name: Copy the quota_service war to the destination place - copy: src={{ smartgears_downloads_dir }}/{{ quota_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ quota_service_name }}.{{ quota_service_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: quota_service_install - tags: [ 'smartgears', 'quota_service', 'tomcat' ] diff --git a/smartgears/r_connector/defaults/main.yml b/smartgears/r_connector/defaults/main.yml deleted file mode 100644 index dd1051b7..00000000 --- a/smartgears/r_connector/defaults/main.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -r_connector_install: False -r_connector_ver: latest -r_connector_name: r-connector -r_connector_group_id: org.gcube.data.analysis -r_connector_extension: war -r_connector_filename: '{{ r_connector_name }}-{{ r_connector_ver }}.{{ r_connector_extension }}' - -r_connector_usershome: /home/ -r_connector_userconfig: userconfig.csv -r_connector_adduserscript: /usr/local/bin/rusersadd -r_connector_workspace_unmount: /usr/local/bin/rconnector_unmount -r_connector_check_stale_sessions: /usr/local/bin/rconnector_check_stale_sessions -r_connector_workspace_mountpoint: workspace -r_connector_sleep_after_mount: 5 -r_connector_rstudio_cookie_key: /var/lib/rstudio-server/secure-cookie-key -r_connector_rprofile_svn_url: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/RConfiguration/RStudioConfiguration' -r_connector_rprofile_filename: '.Rprofile' -r_connector_rprofile_base_dir: '/srv/d4science' -r_connector_rprofile_path: '{{ r_connector_rprofile_base_dir }}/RStudioConfiguration' -r_connector_deb_pkgs: - - ldap-utils - - nslcd - - libnss-ldapd - - libpam-ldapd - - nscd - -r_connector_ldap_enabled: True -r_connector_ldap_map_common: - - common-account - - common-auth - - common-password - - common-session - - common-session-noninteractive - -r_connector_ssl: on -r_connector_tls_reqcert: demand - -#fuse_integration_jar_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/org/gcube/data-access/sh-fuse-integration/1.0.0-4.14.0-178913/sh-fuse-integration-1.0.0-4.14.0-178913-jar-with-dependencies.jar' - -fuse_integration_file: sh-fuse-integration-jar-with-dependencies.jar -fuse_integration_name: sh-fuse-integration -fuse_integration_group_id: org.gcube.data-access -fuse_integration_version: latest -fuse_integration_classifier: 'jar-with-dependencies' -fuse_integration_extension: 'jar' -r_connector_fuse_packages: - - fuse - - libfuse2 diff --git a/smartgears/r_connector/files/check_ldap_users b/smartgears/r_connector/files/check_ldap_users deleted file mode 100644 index d10ccd3a..00000000 --- a/smartgears/r_connector/files/check_ldap_users +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -NSCD_SERVICE="nscd" -NSLCD_SERVICE="nslcd" -SERVICE_CMD="/usr/sbin/service" - -RETVAL= - -CHECK_USER=$( id pasquale.pagano ) -RETVAL=$? - -restart_ns_services() { - $SERVICE_CMD $NSCD_SERVICE restart > /dev/null 2>&1 - $SERVICE_CMD $NSLCD_SERVICE restart > /dev/null 2>&1 - logger "check_ldap_users: Restarted the $NSCD_SERVICE and $NSLCD_SERVICE services." -} - -if [ $RETVAL -ne 0 ] ; then - logger "check_ldap_users: The ldap connection is broken" - restart_ns_services -fi - -exit 0 diff --git a/smartgears/r_connector/files/common-account b/smartgears/r_connector/files/common-account deleted file mode 100644 index 66cc62c1..00000000 --- a/smartgears/r_connector/files/common-account +++ /dev/null @@ -1,26 +0,0 @@ -# -# /etc/pam.d/common-account - authorization settings common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of the authorization modules that define -# the central access policy for use on the system. The default is to -# only deny service to users whose accounts are expired in /etc/shadow. -# -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. -# - -# here are the per-package modules (the "Primary" block) -account [success=1 new_authtok_reqd=done default=ignore] pam_unix.so -# here's the fallback if no module succeeds -account requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -account required pam_permit.so -# and here are more per-package modules (the "Additional" block) -account [success=ok new_authtok_reqd=done ignore=ignore user_unknown=ignore authinfo_unavail=ignore default=bad] pam_ldap.so minimum_uid=1000 -# end of pam-auth-update config diff --git a/smartgears/r_connector/files/common-auth b/smartgears/r_connector/files/common-auth deleted file mode 100644 index ac882b30..00000000 --- a/smartgears/r_connector/files/common-auth +++ /dev/null @@ -1,27 +0,0 @@ -# -# /etc/pam.d/common-auth - authentication settings common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of the authentication modules that define -# the central authentication scheme for use on the system -# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the -# traditional Unix authentication mechanisms. -# -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. - -# here are the per-package modules (the "Primary" block) -auth [success=2 default=ignore] pam_unix.so nullok_secure -auth [success=1 default=ignore] pam_ldap.so minimum_uid=1000 use_first_pass -# here's the fallback if no module succeeds -auth requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -auth required pam_permit.so -# and here are more per-package modules (the "Additional" block) -auth optional pam_cap.so -# end of pam-auth-update config diff --git a/smartgears/r_connector/files/common-password b/smartgears/r_connector/files/common-password deleted file mode 100644 index 9fd26a89..00000000 --- a/smartgears/r_connector/files/common-password +++ /dev/null @@ -1,34 +0,0 @@ -# -# /etc/pam.d/common-password - password-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define the services to be -# used to change user passwords. The default is pam_unix. - -# Explanation of pam_unix options: -# -# The "sha512" option enables salted SHA512 passwords. Without this option, -# the default is Unix crypt. Prior releases used the option "md5". -# -# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in -# login.defs. -# -# See the pam_unix manpage for other options. - -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. - -# here are the per-package modules (the "Primary" block) -password [success=2 default=ignore] pam_unix.so obscure sha512 -password [success=1 default=ignore] pam_ldap.so minimum_uid=1000 try_first_pass -# here's the fallback if no module succeeds -password requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -password required pam_permit.so -# and here are more per-package modules (the "Additional" block) -# end of pam-auth-update config diff --git a/smartgears/r_connector/files/common-session b/smartgears/r_connector/files/common-session deleted file mode 100644 index 8999be82..00000000 --- a/smartgears/r_connector/files/common-session +++ /dev/null @@ -1,31 +0,0 @@ -# -# /etc/pam.d/common-session - session-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define tasks to be performed -# at the start and end of sessions of *any* kind (both interactive and -# non-interactive). -# -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. - -# here are the per-package modules (the "Primary" block) -session [default=1] pam_permit.so -# here's the fallback if no module succeeds -session requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -session required pam_permit.so -# The pam_umask module will set the umask according to the system default in -# /etc/login.defs and user settings, solving the problem of different -# umask settings with different shells, display managers, remote sessions etc. -# See "man pam_umask". -session optional pam_umask.so -# and here are more per-package modules (the "Additional" block) -session required pam_unix.so -session [success=ok default=ignore] pam_ldap.so minimum_uid=1000 -# end of pam-auth-update config diff --git a/smartgears/r_connector/files/common-session-noninteractive b/smartgears/r_connector/files/common-session-noninteractive deleted file mode 100644 index 0791076e..00000000 --- a/smartgears/r_connector/files/common-session-noninteractive +++ /dev/null @@ -1,31 +0,0 @@ -# -# /etc/pam.d/common-session-noninteractive - session-related modules -# common to all non-interactive services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define tasks to be performed -# at the start and end of all non-interactive sessions. -# -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. - -# here are the per-package modules (the "Primary" block) -session [default=1] pam_permit.so -# here's the fallback if no module succeeds -session requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -session required pam_permit.so -# The pam_umask module will set the umask according to the system default in -# /etc/login.defs and user settings, solving the problem of different -# umask settings with different shells, display managers, remote sessions etc. -# See "man pam_umask". -session optional pam_umask.so -# and here are more per-package modules (the "Additional" block) -session required pam_unix.so -session [success=ok default=ignore] pam_ldap.so minimum_uid=1000 -# end of pam-auth-update config diff --git a/smartgears/r_connector/files/ldap-auth-config b/smartgears/r_connector/files/ldap-auth-config deleted file mode 100644 index 83d95391..00000000 --- a/smartgears/r_connector/files/ldap-auth-config +++ /dev/null @@ -1,13 +0,0 @@ -# -# Clients should be able to authenticate with this profile if following -# Network Authentication in the Ubuntu Server guide. Please note that -# these settings are not suitable for sometimes disconnected (eg laptop) -# systems. The example is taken from LDAPClientAuthentication at: -# https://help.ubuntu.com/community/LDAPClientAuthentication -# -[lac_ldap] -nss_passwd=passwd: files ldap -nss_group=group: files ldap -nss_shadow=shadow: files ldap -nss_netgroup=netgroup: nis - diff --git a/smartgears/r_connector/files/nsswitch.conf b/smartgears/r_connector/files/nsswitch.conf deleted file mode 100644 index e269d57c..00000000 --- a/smartgears/r_connector/files/nsswitch.conf +++ /dev/null @@ -1,14 +0,0 @@ -passwd: compat ldap -group: compat -shadow: compat ldap - -hosts: files dns -networks: files - -protocols: db files -services: db files -ethers: db files -rpc: db files - -netgroup: nis - diff --git a/smartgears/r_connector/handlers/main.yml b/smartgears/r_connector/handlers/main.yml deleted file mode 100644 index 34a52758..00000000 --- a/smartgears/r_connector/handlers/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Restart the NSLCD service - service: name=nslcd state=restarted - notify: Restart rstudio server - -- name: Restart the NSCD service - service: name=nscd state=restarted - notify: Restart rstudio server - -- name: Restart rstudio server - service: name=rstudio-server state=restarted diff --git a/smartgears/r_connector/tasks/main.yml b/smartgears/r_connector/tasks/main.yml deleted file mode 100644 index 6ed05185..00000000 --- a/smartgears/r_connector/tasks/main.yml +++ /dev/null @@ -1,174 +0,0 @@ ---- -- block: - - name: Remove the installed R connector - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ r_connector_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ r_connector_name }}.{{ r_connector_extension }}' - notify: Restart smartgears - - - name: Remove the packages required to enable the LDAP PAM authentication - become_user: root - apt: pkg={{ item }} state=absent - with_items: '{{ r_connector_deb_pkgs }}' - - - name: Remove the connector raddusers and rconnector_unmount scripts - become_user: root - file: dest={{ item }} state=absent - with_items: - - '{{ r_connector_adduserscript }}' - - '{{ r_connector_workspace_unmount }}' - - - name: Remove the RConfiguration repo - file: dest={{ r_connector_rprofile_path }} state=absent - - - name: Remove the cron job that regulary updates the Rprofile - cron: name="Update the RStudioConfiguration repo" job="cd {{ r_connector_rprofile_path }} ; svn update >/dev/null 2>&1" state=absent - - become: True - become_user: '{{ smartgears_user }}' - when: not r_connector_install - tags: [ 'r_connector' ] - -- block: - - name: Get the R Connector war - maven_artifact: artifact_id={{ r_connector_name }} version={{ r_connector_ver | default('latest') }} group_id={{ r_connector_group_id }} extension={{ r_connector_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ r_connector_filename }} verify_checksum=always - register: r_connector_download - - - name: Remove the installed R connector before upgrading - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ r_connector_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ r_connector_name }}.{{ r_connector_extension }}' - notify: Restart smartgears - when: r_connector_download is changed - - - name: Create the R connector webapp directory - file: dest={{ smartgears_instance_path }}/webapps/{{ r_connector_name }} state=directory - when: r_connector_download is changed - - - name: Unarchive the R connector war file - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ r_connector_filename }} dest={{ smartgears_instance_path }}/webapps/{{ r_connector_name }} - args: - creates: '{{ smartgears_instance_path }}/webapps/{{ r_connector_name }}/WEB-INF/web.xml' - notify: Restart smartgears - - - name: Obtain the permission to read the Rstudio secure cookie key - become_user: root - file: dest={{ r_connector_rstudio_cookie_key }} mode=640 group={{ smartgears_user }} - - - name: Install the R connector web.xml template - template: src=r-web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ r_connector_name }}/WEB-INF/web.xml mode=0440 - notify: Restart smartgears - - - name: Install the rconnector add users script - become_user: root - template: src=rusersadd.j2 dest={{ r_connector_adduserscript }} owner=root group=root mode=0555 - tags: [ 'smartgears', 'r_connector', 'r_connector_conf', 'tomcat' ] - - - name: Install the script that unmounts the remote workspace - become_user: root - template: src=rconnector_unmount dest={{ r_connector_workspace_unmount }} owner=root group=root mode=0555 - tags: [ 'r_connector', 'r_connector_conf' ] - - - name: Install the script that checks for stale workspace mounts - become_user: root - template: src=rconnector_check_stale_sessions dest={{ r_connector_check_stale_sessions }} owner=root group=root mode=0555 - tags: [ 'r_connector', 'r_connector_conf' ] - - - name: Install the cron job that regulary wipes out the stale workspace mounts - become_user: root - cron: name="Unmount the stale workspace sessions" special_time=hourly job="{{ r_connector_check_stale_sessions }} >/dev/null 2>&1" user=root - tags: [ 'r_connector', 'r_connector_conf' ] - - - name: Crete the directory that will host the RConfiguration stuff - become_user: root - file: dest={{ r_connector_rprofile_base_dir }} owner={{ d4science_user }} group={{ d4science_user }} state=directory - - - name: Download the fuse jar-with-dependencies - become_user: root - maven_artifact: artifact_id={{ fuse_integration_name }} version={{ fuse_integration_version }} group_id={{ fuse_integration_group_id }} extension={{ fuse_integration_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ fuse_integration_classifier }} dest=/usr/local/lib/{{ fuse_integration_file }} - - - name: Get the svn repository that provides the .Rprofile - subversion: repo={{ r_connector_rprofile_svn_url }} dest={{ r_connector_rprofile_path }} - - - name: Install /etc/R/Rprofile.site as a symlink to the svn repository - become_user: root - file: src={{ r_connector_rprofile_path }}/.Rprofile dest=/etc/R/Rprofile.site state=link force=yes - tags: [ 'r_connector', 'r_connector_conf' ] - - - name: Install the cron job that regulary updates the Rprofile - cron: name="Update the RStudioConfiguration repo" special_time=daily job="cd {{ r_connector_rprofile_path }} ; svn update >/dev/null 2>&1" - - become: True - become_user: '{{ smartgears_user }}' - when: r_connector_install - tags: [ 'r_connector' ] - -- block: -# Additional fuse packages - - name: Install the fuse required packages - apt: pkg={{ r_connector_fuse_packages }} state=present update_cache=yes cache_valid_time=3600 - - when: r_connector_install - tags: [ 'smartgears', 'r_connector', 'tomcat' ] - -- block: - - name: Reconfigure the Java environment for R - shell: export JAVA_HOME={{ jdk_java_home }} ; export J2SDKDIR={{ jdk_java_home }} ; export J2REDIR={{ jdk_java_home }}/jre ; R CMD javareconf - when: jdk_java_home is defined - - become: True - become_user: root - when: r_connector_install - tags: [ 'smartgears', 'r_connector', 'tomcat' ] - -- block: - - name: Install the packages required to enable the LDAP PAM authentication - apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 - with_items: '{{ r_connector_deb_pkgs }}' - - - name: Install the pam ldap configuration. We cannot use the debian tools, they are broken on ubuntu in non interactive mode - copy: src={{ item }} dest=/etc/pam.d/{{ item }} - with_items: '{{ r_connector_ldap_map_common }}' - notify: - - Restart the NSLCD service - - Restart the NSCD service - - - name: Create the ldap-auth-config directory - file: dest=/etc/auth-client-config/profile.d state=directory - notify: - - Restart the NSLCD service - - Restart the NSCD service - - - name: Install the ldap-auth-config file - copy: src=ldap-auth-config dest=/etc/auth-client-config/profile.d/ldap-auth-config - notify: - - Restart the NSLCD service - - Restart the NSCD service - - - name: Install the nsswitch.conf file - copy: src=nsswitch.conf dest=/etc/nsswitch.conf - notify: - - Restart the NSLCD service - - Restart the NSCD service - - - name: Install the nslcd configuration - template: src=nslcd.conf.j2 dest=/etc/nslcd.conf mode=0640 owner=root group=nslcd - notify: - - Restart the NSLCD service - - Restart the NSCD service - tags: [ 'smartgears', 'r_connector', 'tomcat', 'r_connector_nslcd_conf' ] - - - name: Install a script that checks if the ldap authentication is working, and if not it restarts the ns(l)cd daemons - copy: src=check_ldap_users dest=/usr/local/bin/check_ldap_users owner=root group=root mode=0555 - tags: [ 'smartgears', 'r_connector', 'tomcat', 'r_connector_check_ldap' ] - - - name: Add a cron job that runs the ldap users check script - cron: name="check ldap users" job="/usr/local/bin/check_ldap_users" state=present user=root - tags: [ 'smartgears', 'r_connector', 'tomcat', 'r_connector_check_ldap' ] - - when: - - r_connector_install - - r_connector_ldap_enabled - tags: [ 'smartgears', 'r_connector', 'tomcat' ] diff --git a/smartgears/r_connector/templates/nslcd.conf.j2 b/smartgears/r_connector/templates/nslcd.conf.j2 deleted file mode 100644 index 43c83a18..00000000 --- a/smartgears/r_connector/templates/nslcd.conf.j2 +++ /dev/null @@ -1,34 +0,0 @@ -# /etc/nslcd.conf -# nslcd configuration file. See nslcd.conf(5) -# for details. - -# The user and group nslcd should run as. -uid nslcd -gid nslcd - -# The location at which the LDAP server(s) should be reachable. -uri {{ r_connector_nslcd_ldap_uri }} - -# The search base that will be used for all queries. -base {{ r_connector_nslcd_ldap_base }} - -# The LDAP protocol version to use. -ldap_version 3 -tls_cacertdir /etc/ssl/certs -tls_cacertfile {{ r_connector_nslcd_cafile }} - -# The DN to bind with for normal lookups. -#binddn cn=annonymous,dc=example,dc=net -#bindpw secret - -# The DN used for password modifications by root. -#rootpwmoddn cn=admin,dc=example,dc=com - -# SSL options -ssl {{ r_connector_ssl }} -tls_reqcert {{ r_connector_tls_reqcert }} - -# The search scope. -#scope sub - -bind_timelimit 120 diff --git a/smartgears/r_connector/templates/r-web.xml.j2 b/smartgears/r_connector/templates/r-web.xml.j2 deleted file mode 100644 index f5545a48..00000000 --- a/smartgears/r_connector/templates/r-web.xml.j2 +++ /dev/null @@ -1,38 +0,0 @@ - - - usersHome - {{ r_connector_usershome }} - - - filename - {{ r_connector_userconfig }} - - - addUserScript - {{ r_connector_adduserscript }} - - - unmountScript - {{ r_connector_workspace_unmount }} - - - storedKeyPath - {{ r_connector_rstudio_cookie_key }} - - - rStudioAddress - {{ ansible_fqdn }} - - - unmountScript - {{ r_connector_workspace_unmount }} - - - - org.gcube.data.analysis.rconnector.RConnector - - - org.gcube.data.analysis.rconnector.RConnector - /gcube/service/* - - diff --git a/smartgears/r_connector/templates/rconnector_check_stale_sessions b/smartgears/r_connector/templates/rconnector_check_stale_sessions deleted file mode 100644 index 0f2eebc3..00000000 --- a/smartgears/r_connector/templates/rconnector_check_stale_sessions +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -DEBUG=1 -if [ $DEBUG -eq 0 ] ; then - set -x - exec 2>/var/tmp/rconnector_check_stale_sessions.log -fi -# We use logger to log directly to syslog -LOG_PREFIX="r-connector check_stale_sessions:" - -UNMOUNT_SCRIPT="{{ r_connector_workspace_unmount }}" -RSTUDIO_BIN="/usr/sbin/rstudio-server" -ACTIVE_MOUNTS= -ACTIVE_MOUNTS_F=$( mktemp /tmp/active_mounts.XXXXX ) -ACTIVE_SESSIONS_LIST= -ACTIVE_SESSIONS_LIST_F=$( mktemp /tmp/active_sessions.XXXXX ) -STALE_SESSIONS_LIST= - -list_mounts() { - ACTIVE_MOUNTS=$( /bin/ps auwwx | grep -i java | grep "fuse-integration" | grep sudo | grep -v grep | awk '{print $13}' | sort > "$ACTIVE_MOUNTS_F" ) - if [ $DEBUG -eq 0 ] ; then - for m in $ACTIVE_MOUNTS ; do - logger "$LOG_PREFIX Active session: $m" - done - fi -} -check_running_sessions() { - ACTIVE_SESSIONS_LIST=$( $RSTUDIO_BIN active-sessions | grep rsession | grep -v grep | awk '{print $5 }' | sort > "$ACTIVE_SESSIONS_LIST_F" ) - if [ $DEBUG -eq 0 ] ; then - for ses in $ACTIVE_SESSIONS_LIST ; do - logger "$LOG_PREFIX Active mount: $ses" - done - fi -} - -umount_stale_sessions() { - STALE_SESSIONS_LIST=$( /usr/bin/comm -23 "$ACTIVE_MOUNTS_F" "$ACTIVE_SESSIONS_LIST_F" ) - for stale_s in $STALE_SESSIONS_LIST ; do - if [ $DEBUG -eq 0 ] ; then - logger "$LOG_PREFIX Stale session: $stale_s" - fi - $UNMOUNT_SCRIPT "$stale_s" - done -} - -list_mounts -check_running_sessions -umount_stale_sessions -rm -f "$ACTIVE_MOUNTS_F" "$ACTIVE_SESSIONS_LIST_F" -exit 0 diff --git a/smartgears/r_connector/templates/rconnector_unmount b/smartgears/r_connector/templates/rconnector_unmount deleted file mode 100644 index bc87d0a4..00000000 --- a/smartgears/r_connector/templates/rconnector_unmount +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -WORKSPACE_USER=$1 -RETVAL=0 -RCONNECTOR_WORKSPACE_MOUNTPOINT="{{ r_connector_workspace_mountpoint }}" - -MOUNT_WORKSPACE_PID=$( ps auwwx | grep -i java | grep "$WORKSPACE_USER" | grep "$RCONNECTOR_WORKSPACE_MOUNTPOINT" | grep -v sudo | awk '{print $2}' ) - -if [ ! -z "$MOUNT_WORKSPACE_PID" ] ; then - logger "rconnector_unmount: trying to unmount the workspace of the user $WORKSPACE_USER, pid $MOUNT_WORKSPACE_PID" - sudo /bin/kill -15 "$MOUNT_WORKSPACE_PID" - RETVAL=$? - logger "rconnector_unmount: umount result: $RETVAL" -else - logger "rconnector_unmount: no mounted workspace for the user $WORKSPACE_USER" -fi - -exit $RETVAL diff --git a/smartgears/r_connector/templates/rusersadd.j2 b/smartgears/r_connector/templates/rusersadd.j2 deleted file mode 100755 index e35fdc23..00000000 --- a/smartgears/r_connector/templates/rusersadd.j2 +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -DEBUG=1 -if [ $DEBUG -eq 0 ] ; then - set -x - exec 2>/var/tmp/rusersadd.log -fi -# We use logger to log directly to syslog -LOG_PREFIX="r-connector rusersadd:" - -USER="$1" -GCUBE_TOKEN= -GCUBE_SCOPES= -REMOTE_WORKSPACE_MOUNT=0 -SLEEP_AFTER_MOUNT={{ r_connector_sleep_after_mount }} -if [ $# -ne 3 ] ; then - REMOTE_WORKSPACE_MOUNT=1 - logger "$LOG_PREFIX: this rconnector does not support the remote workspace mount" -else - GCUBE_TOKEN="$2" - GCUBE_SCOPES="$3" -fi - -HDIR="{{ r_connector_usershome }}$USER" -# 0: allowed -# 1: not allowed -ALLOW_LOCAL_USERS=1 -RPROFILE_FILE='{{ r_connector_rprofile_path }}/{{ r_connector_rprofile_filename }}' -FUSE_INTEGRATION_JAR=/usr/local/lib/sh-fuse-integration-jar-with-dependencies.jar -WORKSPACE_MOUNT_DIR="$HDIR/{{ r_connector_workspace_mountpoint }}" - -workspace_mount () { - if [ $REMOTE_WORKSPACE_MOUNT -eq 0 ] ; then - "{{ r_connector_workspace_unmount }}" "$USER" - logger "$LOG_PREFIX: Trying to mount the remote workspace" - [ $DEBUG -eq 0 ] && logger "$LOG_PREFIX: Mount command is sudo -u $USER /usr/bin/java -jar $FUSE_INTEGRATION_JAR $GCUBE_TOKEN $GCUBE_SCOPES $WORKSPACE_MOUNT_DIR" - sudo /bin/mkdir -p "$WORKSPACE_MOUNT_DIR" - sudo /bin/chown "${USER}" "$WORKSPACE_MOUNT_DIR" - sudo -u "$USER" /usr/bin/java -jar $FUSE_INTEGRATION_JAR $GCUBE_TOKEN $GCUBE_SCOPES $WORKSPACE_MOUNT_DIR > "/var/tmp/workspace_${USER}.log" 2>&1 & - sleep "$SLEEP_AFTER_MOUNT" - fi -} - -fix_userconfig_perms () { - sudo /usr/bin/touch "${HDIR}/{{ r_connector_userconfig }}" - sudo /bin/chmod 660 "$HDIR/{{ r_connector_userconfig }}" - sudo /bin/chown "${USER}:{{ smartgears_user }}" "$HDIR/{{ r_connector_userconfig }}" - sudo /usr/bin/setfacl -m u:${USER}:rw,g:{{ smartgears_user }}:rw $HDIR/{{ r_connector_userconfig }} -} - -# -# Main -# -if [ -d "$HDIR" ] ; then - if id -u "$USER" >/dev/null 2>&1 - then - logger "$LOG_PREFIX user $HDIR directory exists. Touching the userconfig.csv file to ensure that it exists with the correct permissions" - fix_userconfig_perms - sudo /bin/ln -s "$RPROFILE_FILE" "$HDIR/{{ r_connector_rprofile_filename }}" - workspace_mount - exit 0 - else - logger "$LOG_PREFIX user $HDIR directory exists but the user not. Aborting." - exit 1 - fi -else - if id -u "$USER" >/dev/null 2>&1 - then - logger "$LOG_PREFIX ldap user $USER first login" - sudo /bin/mkdir -p "$HDIR" - sudo /bin/chown -R "$USER" "$HDIR" - sudo /bin/chmod g-wr,o-rwx "$HDIR" - fix_userconfig_perms - sudo /bin/chgrp {{ smartgears_user }} "$HDIR" - sudo /bin/ln -s "$RPROFILE_FILE" "$HDIR/{{ r_connector_rprofile_filename }}" - workspace_mount - exit 0 - else - logger "$LOG_PREFIX user $USER does not exist locally and is not an ldap user" - if [ $ALLOW_LOCAL_USERS -eq 1 ] ; then - logger "$LOG_PREFIX non ldap users not allowed, refusing to create the user." - exit 1 - else - logger "$LOG_PREFIX non ldap users allowed, adding the user $USER locally" - sudo /usr/sbin/useradd -m -s /bin/false -g {{ smartgears_user }} "$USER" - sudo /bin/chmod g+ws "$HDIR" - fix_userconfig_perms - sudo /bin/chgrp -R {{ smartgears_user }} "$HDIR" - sudo /bin/ln -s "$RPROFILE_FILE" "$HDIR/{{ r_connector_rprofile_filename }}" - exit 0 - fi - fi -fi diff --git a/smartgears/resource_checker_se_plugin/defaults/main.yml b/smartgears/resource_checker_se_plugin/defaults/main.yml deleted file mode 100644 index 8b6dcaef..00000000 --- a/smartgears/resource_checker_se_plugin/defaults/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -resource_checker_se_plugin_install: False -resource_checker_se_plugin_upgrade: False -resource_checker_se_plugin_version: 1.1.0-4.10.0-150530 -# resource_checker_se_plugin_version: 1.0.0-SNAPSHOT -resource_checker_se_plugin_group_id: 'org.gcube.information-system' -resource_checker_se_plugin_name: 'resource-checker-se-plugin' -resource_checker_se_plugin_extension: 'jar' -resource_checker_se_plugin_classifier: 'jar-with-dependencies' -resource_checker_se_plugin_file: '{{ resource_checker_se_plugin_name }}-{{ resource_checker_se_plugin_version }}-jar-with-dependencies.{{ resource_checker_se_plugin_extension }}' - -resource_checker_nagios_nrpe: True diff --git a/smartgears/resource_checker_se_plugin/tasks/main.yml b/smartgears/resource_checker_se_plugin/tasks/main.yml deleted file mode 100644 index d3184b51..00000000 --- a/smartgears/resource_checker_se_plugin/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- block: - - name: Remove the old resource checker plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/resource-checker-se-plugin-*-jar-with-dependencies.jar - when: resource_checker_se_plugin_upgrade - - - name: Install the resource checker plugin inside the smart executor lib directory - maven_artifact: artifact_id={{ resource_checker_se_plugin_name }} version={{ resource_checker_se_plugin_version | default(omit) }} group_id={{ resource_checker_se_plugin_group_id }} extension={{ resource_checker_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ resource_checker_se_plugin_classifier }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ resource_checker_se_plugin_file }} - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: resource_checker_se_plugin_install - tags: [ 'smartgears', 'resource_checker_se', 'tomcat' ] - -- block: - - name: Install the resource checker nagios check - template: src=check_missing_resources.sh.j2 dest={{ nagios_plugdir | default('/usr/lib/nagios/plugins') }}/check_missing_resources mode=0755 - when: nagios_enabled is defined and nagios_enabled - - - name: Install the nrpe job to run the check - template: src=resource_checker_nrpe.cfg.j2 dest=/etc/nagios/nrpe.d/resource_checker_nrpe.cfg owner=root group=root mode=0444 - when: nagios_enabled is defined and nagios_enabled - notify: Reload NRPE server - - become: False - when: resource_checker_se_plugin_install and resource_checker_nagios_nrpe - tags: [ 'smartgears', 'resource_checker_se', 'nagios' ] - diff --git a/smartgears/resource_checker_se_plugin/templates/check_missing_resources.sh.j2 b/smartgears/resource_checker_se_plugin/templates/check_missing_resources.sh.j2 deleted file mode 100644 index 4c2c0c7c..00000000 --- a/smartgears/resource_checker_se_plugin/templates/check_missing_resources.sh.j2 +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -COMMON_SH_LIB={{ nagios_isti_plugdir }}/check_library.sh -RESOURCES_STATUS_FILE={{ smartgears_user_home }}/missing_resources/identifiers - -# First things first: check if the service is running -RUNNING_FILE=$( find /{{ smartgears_user_home }}/missing_resources/identifiers -mmin -120 ) -if [ -z $RUNNING_FILE ] ; then - echo "CRITICAL - The resource checker did not update for more than two hours" - exit $NAGIOS_CRITICAL -fi - -if [ -f $COMMON_SH_LIB ] ; then - . $COMMON_SH_LIB -else - echo "UNKNOWN - Library file $COMMON_SH_LIB does not exist" - exit $NAGIOS_UNKNOWN -fi - -if [ ! -f $RESOURCES_STATUS_FILE ] ; then - echo "UNKNOWN - File $RESOURCES_STATUS_FILE does not exist" - exit $NAGIOS_UNKNOWN -fi - -RESOURCES_DATA=$( cat $RESOURCES_STATUS_FILE ) -if [ "$RESOURCES_DATA" == "none" ] ; then - echo "OK - No resources are missing" - exit $NAGIOS_OK -else - echo "CRITICAL - Missing resources: $RESOURCES_DATA" - exit $NAGIOS_CRITICAL -fi - diff --git a/smartgears/resource_checker_se_plugin/templates/resource_checker_nrpe.cfg.j2 b/smartgears/resource_checker_se_plugin/templates/resource_checker_nrpe.cfg.j2 deleted file mode 100644 index 97f77a5e..00000000 --- a/smartgears/resource_checker_se_plugin/templates/resource_checker_nrpe.cfg.j2 +++ /dev/null @@ -1,2 +0,0 @@ -command[nrpe_resource_checker]={{ nagios_plugdir | default('/usr/lib/nagios/plugins') }}/check_missing_resources - diff --git a/smartgears/resource_registry/defaults/main.yml b/smartgears/resource_registry/defaults/main.yml deleted file mode 100644 index 893d6e40..00000000 --- a/smartgears/resource_registry/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -resource_registry_install: False -resource_registry_upgrade: False -resource_registry_version: latest -resource_registry_name: resource-registry -resource_registry_extension: war -resource_registry_file: '{{ resource_registry_name }}-{{ resource_registry_version }}.{{ resource_registry_extension }}' -resource_registry_group_id: org.gcube.information-system - -resource_registry_db_key_filename: '{{ orientdb_db_name }}.key' -resource_registry_db_key_algorithm: 'AES' \ No newline at end of file diff --git a/smartgears/resource_registry/tasks/main.yml b/smartgears/resource_registry/tasks/main.yml deleted file mode 100644 index 52503214..00000000 --- a/smartgears/resource_registry/tasks/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- block: - - name: Remove the old resource-registry files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ resource_registry_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ resource_registry_name }}.{{ resource_registry_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'resource_registry', 'tomcat' ] - when: not resource_registry_install - -- block: - - name: Get the resource_registry war - maven_artifact: artifact_id={{ resource_registry_name }} version={{ resource_registry_version | default('latest') }} group_id={{ resource_registry_group_id }} extension={{ resource_registry_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ resource_registry_file }} verify_checksum=always - register: resource_registry_download - - - name: Remove the old resource-registry files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ resource_registry_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ resource_registry_name }}.{{ resource_registry_extension }}' - when: resource_registry_download is changed - - - name: Create the resource-registry working directory - file: path={{ smartgears_instance_path }}/webapps/{{ resource_registry_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - when: resource_registry_download is changed - - - name: Unarchive the resource registry war - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ resource_registry_file }} dest={{ smartgears_instance_path }}/webapps/{{ resource_registry_name }} creates={{ smartgears_instance_path }}/webapps/{{ resource_registry_name }}/WEB-INF/lib - notify: Restart smartgears - - - name: Install the resource registry configuration - template: src=config.properties.j2 dest={{ smartgears_instance_path }}/webapps/{{ resource_registry_name }}/WEB-INF/classes/config.properties mode=0440 - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'resource_registry', 'tomcat' ] - when: resource_registry_install diff --git a/smartgears/resource_registry/templates/config.properties.j2 b/smartgears/resource_registry/templates/config.properties.j2 deleted file mode 100644 index 9c916fff..00000000 --- a/smartgears/resource_registry/templates/config.properties.j2 +++ /dev/null @@ -1,21 +0,0 @@ -HOST={{ orientdb_host }} -REMOTE_PROTOCOL={{ orientdb_remote_protocol }} -HTTP_PROTOCOL={{ orientdb_http_protocol }} -HTTP_PORT={{ orientdb_http_port }} -DB={{ orientdb_db_name }} - -ROOT_USERNAME={{ orientdb_root_username }} -ROOT_PASSWORD={{ orientdb_root_pwd }} - - -DEFAULT_ADMIN_USERNAME={{ orientdb_default_admin_user }} -CHANGED_ADMIN_USERNAME={{ orientdb_admin_user }} - -DEFAULT_ADMIN_PASSWORD={{ orientdb_default_admin_password }} -CHANGED_ADMIN_PASSWORD={{ orientdb_admin_password }} - -DEFAULT_CREATED_WRITER_USER_PASSWORD={{ orientdb_writer_password }} -DEFAULT_CREATED_READER_USER_PASSWORD={{ orientdb_reader_password }} - -DB_KEY_FILENAME={{ resource_registry_db_key_filename }} -DB_KEY_ALGORITHM={{ resource_registry_db_key_algorithm }} diff --git a/smartgears/resource_registry/templates/gcube-app.xml.j2 b/smartgears/resource_registry/templates/gcube-app.xml.j2 deleted file mode 100644 index 4b9ec4a7..00000000 --- a/smartgears/resource_registry/templates/gcube-app.xml.j2 +++ /dev/null @@ -1,9 +0,0 @@ - - - - joint-resource-registry - InformationSystem - 1.4.0-4.5.0-148947 - Resource Registry - - \ No newline at end of file diff --git a/smartgears/resource_registry_handlers/defaults/main.yml b/smartgears/resource_registry_handlers/defaults/main.yml deleted file mode 100644 index 9db8394f..00000000 --- a/smartgears/resource_registry_handlers/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -resource_registry_handlers_install: False -resource_registry_handlers_upgrade: False -resource_registry_handlers_version: latest -resource_registry_handlers_name: resource-registry-handlers -resource_registry_handlers_extension: jar -resource_registry_handlers_file: '{{ resource_registry_handlers_name }}-{{ resource_registry_handlers_version }}.{{ resource_registry_handlers_extension }}' -resource_registry_handlers_group_id: org.gcube.smartgears.handlers diff --git a/smartgears/resource_registry_handlers/tasks/main.yml b/smartgears/resource_registry_handlers/tasks/main.yml deleted file mode 100644 index 481d60ce..00000000 --- a/smartgears/resource_registry_handlers/tasks/main.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- block: - - name: Remove the old resource-registry-handlers files - shell: rm -f {{ smartgears_instance_path }}/lib/{{ resource_registry_handlers_name }}-*.{{ resource_registry_handlers_extension }} - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'resource_registry_handlers', 'tomcat' ] - when: not resource_registry_handlers_install - -- block: - - name: Get the resource_registry_handlers jar - maven_artifact: artifact_id={{ resource_registry_handlers_name }} version={{ resource_registry_handlers_version | default('latest') }} group_id={{ resource_registry_handlers_group_id }} extension={{ resource_registry_handlers_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ resource_registry_handlers_file }} - register: resource_registry_handlers_download - - - name: Remove the old resource-registry-handlers file - shell: rm -f {{ smartgears_instance_path }}/lib/{{ resource_registry_handlers_name }}-*.{{ resource_registry_handlers_extension }} - when: resource_registry_handlers_download is changed - - - name: Copy the resource registry jar file into the tomcat lib directory - copy: src={{ smartgears_downloads_dir }}/{{ resource_registry_handlers_file }} dest={{ smartgears_instance_path }}/lib/{{ resource_registry_handlers_file }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'resource_registry_handlers', 'tomcat' ] - when: resource_registry_handlers_install diff --git a/smartgears/resource_updater/defaults/main.yml b/smartgears/resource_updater/defaults/main.yml deleted file mode 100644 index 6d3d2c6f..00000000 --- a/smartgears/resource_updater/defaults/main.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -# -# org.gcube.resources -# resource-updater-cli -# 0.0.1-SNAPSHOT -# - -# per prod dovrebbe essere questo: -# java -cp ".:./resource-updater-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar" org.gcube.resourcemanagement.updater.AccessPointUpdater /d4science.research-infrastructures.eu DataAnalysis DataMiner dataminer.garr.d4science.org environment.properties - -# per il cluster di proto: -# java -cp ".:./resource-updater-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar" org.gcube.resourcemanagement.updater.AccessPointUpdater /d4science.research-infrastructures.eu DataAnalysis DataMiner dataminer-prototypes.d4science.org environment.properties - -# per i gw di proto: -# java -cp ".:./resource-updater-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar" org.gcube.resourcemanagement.updater.AccessPointUpdater /d4science.research-infrastructures.eu DataAnalysis DataMinerWorkers dataminer-genericworkers-proto.d4science.org environment.properties - -# per i gw di produzione: -# java -cp ".:./resource-updater-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar" org.gcube.resourcemanagement.updater.AccessPointUpdater /d4science.research-infrastructures.eu DataAnalysis DataMinerWorkers dataminer-genericworkers.d4science.org environment.properties - -# per dataminer preprod: -# java -cp ".:./resource-updater-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar" org.gcube.resourcemanagement.updater.AccessPointUpdater /gcube/preprod DataAnalysis DataMiner dataminer1-pre.d4science.org environment.properties - -# per gw di preprod: -# java -cp ".:./resource-updater-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar" org.gcube.resourcemanagement.updater.AccessPointUpdater /gcube/preprod DataAnalysis DataMinerWorkers dataminer1-pre.d4science.org environment.properties - -resource_updater_install: False -resource_updater_master: False -resource_updater_name: resource-updater-cli -resource_updater_group_id: org.gcube.resources -resource_updater_extension: jar -resource_updater_version: latest -resource_updater_classifier: jar-with-dependencies -resource_updater_deps_file: '{{ resource_updater_name }}-{{ resource_updater_version }}-{{ resource_updater_classifier }}.{{ resource_updater_extension }}' -resource_updater_file: '{{ resource_updater_name }}.{{ resource_updater_extension }}' -smartgears_resource_updater_base_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots' -resource_updater_dest_dir: '{{ smartgears_user_home }}/resource_updater' - -# resource_updater_properties: -# - { key: 'python2', value: '2.7.6' } -# - { key: 'python3', value: '3.4.3' } -# - { key: 'R', value: '3.4.4' } -# - { key: 'Java', value: '8' } -# - { key: 'KNIME', value: '3.6.1' } diff --git a/smartgears/resource_updater/tasks/main.yml b/smartgears/resource_updater/tasks/main.yml deleted file mode 100644 index cad44cb0..00000000 --- a/smartgears/resource_updater/tasks/main.yml +++ /dev/null @@ -1,58 +0,0 @@ ---- -- block: - - name: Remove the resources updater - file: path={{ resource_updater_dest_dir }} state=absent - - - name: Remove the cron job that runs the resources updater script where is not needed - cron: name="Resources Updater" special_time=daily job="/usr/local/bin/resources_updater > {{ resource_updater_dest_dir }}/resources_updater.log 2>&1" state=absent - - - name: Remove the resources updater script - become_user: root - file: dest=/usr/local/bin/resources_updater state=absent - - become: True - become_user: '{{ d4science_user }}' - when: not resource_updater_install - tags: [ 'smartgears', 'resource_updater' ] - -- block: - - name: Get the resource updater jar file - maven_artifact: artifact_id={{ resource_updater_name }} version={{ resource_updater_version }} group_id={{ resource_updater_group_id }} classifier={{ resource_updater_classifier }} extension={{ resource_updater_extension }} repository_url={{ smartgears_resource_updater_base_url }} dest={{ smartgears_downloads_dir }}/{{ resource_updater_deps_file }} verify_checksum=always - register: resource_updater_download - - - name: Remove the old resources updater files - file: path={{ resource_updater_dest_dir }} state=absent - when: resource_updater_download is changed - - - name: Create the resources updater destination directory - file: dest={{ resource_updater_dest_dir }} state=directory - - - name: Copy the resources updater jar file - copy: src={{ smartgears_downloads_dir }}/{{ resource_updater_deps_file }} dest={{ resource_updater_dest_dir }}/{{ resource_updater_file }} remote_src=yes force=yes - - - name: Install the resources updater properties - template: src=resources_updater.properties dest={{ resource_updater_dest_dir }}/resources_updater.properties - register: resource_data_changes - - - name: Install the resources updater script - become_user: root - template: src=resources_updater.sh dest=/usr/local/bin/resources_updater owner=root group=root mode=0755 - - - name: Install a cron job that runs the resources updater script - cron: name="Resources Updater" special_time=daily job="/usr/local/bin/resources_updater > {{ resource_updater_dest_dir }}/resources_updater.log 2>&1" state=present - when: resource_updater_master - - - name: Remove the cron job that runs the resources updater script where is not needed - cron: name="Resources Updater" special_time=daily job="/usr/local/bin/resources_updater > {{ resource_updater_dest_dir }}/resources_updater.log 2>&1" state=absent - when: not resource_updater_master - - - name: Run the resources_updater script if the properties file changed - shell: /usr/local/bin/resources_updater > {{ resource_updater_dest_dir }}/resources_updater.log 2>&1 - when: - - resource_updater_master - - resource_data_changes is changed - - become: True - become_user: '{{ d4science_user }}' - when: resource_updater_install - tags: [ 'smartgears', 'resource_updater', 'tomcat' ] diff --git a/smartgears/resource_updater/templates/resources_updater.properties b/smartgears/resource_updater/templates/resources_updater.properties deleted file mode 100644 index b8db588c..00000000 --- a/smartgears/resource_updater/templates/resources_updater.properties +++ /dev/null @@ -1,3 +0,0 @@ -{% for property in resource_updater_properties %} -{{ property.key }}={{ property.value }} -{% endfor %} diff --git a/smartgears/resource_updater/templates/resources_updater.sh b/smartgears/resource_updater/templates/resources_updater.sh deleted file mode 100644 index 9f02087c..00000000 --- a/smartgears/resource_updater/templates/resources_updater.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -RES_UPDATER_DIR="{{ resource_updater_dest_dir }}" -#RES_UPDATER_PROPERTIES_FILE="{{ resource_updater_dest_dir }}/resources_updater.properties" -RES_UPDATER_PROPERTIES_FILE="resources_updater.properties" -SM_INFRA_NAME="/{{ smartgears_infrastructure_name }}" -SM_SERVICE_ENDPOINT_GROUP="{{ smartgears_service_endpoint_group }}" -SM_SERVICE_ENDPOINT_NAME="{{ smartgears_service_endpoint_name }}" -SM_SERVICE_ENDPOINT_HOST="{{ smartgears_service_endpoint_host }}" - -cd "$RES_UPDATER_DIR" -java -cp ".:./resource-updater-cli.jar" org.gcube.resourcemanagement.updater.AccessPointUpdater "$SM_INFRA_NAME" "$SM_SERVICE_ENDPOINT_GROUP" "$SM_SERVICE_ENDPOINT_NAME" "$SM_SERVICE_ENDPOINT_HOST" "$RES_UPDATER_PROPERTIES_FILE" - diff --git a/smartgears/sdi_service/defaults/main.yml b/smartgears/sdi_service/defaults/main.yml deleted file mode 100644 index 1edb77c4..00000000 --- a/smartgears/sdi_service/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -sdi_service_install: False -sdi_service_upgrade: False -sdi_service_version: latest -sdi_service_name: sdi-service - -sdi_group_id: org.gcube.spatial.data -sdi_extension: war -sdi_service_file: '{{ sdi_service_name }}-{{ sdi_service_version }}.{{ sdi_extension }}' - diff --git a/smartgears/sdi_service/tasks/main.yml b/smartgears/sdi_service/tasks/main.yml deleted file mode 100644 index 13c0c6e3..00000000 --- a/smartgears/sdi_service/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old sdi files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ sdi_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ sdi_service_name }}.{{ sdi_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not sdi_service_install - tags: [ 'sdi_service' ] - -- block: - - name: Get the sdi-service - maven_artifact: artifact_id={{ sdi_service_name }} version={{ sdi_service_version | default('latest') }} group_id={{ sdi_group_id }} extension={{ sdi_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ sdi_service_file }} verify_checksum=always - register: sdi_service_download - - - name: Remove the old sdi files - file: path={{ smartgears_instance_path }}/webapps/{{ sdi_service_name }} state=absent - when: sdi_service_download is changed - - - name: Copy the sdi service war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ sdi_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ sdi_service_name }}.{{ sdi_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: sdi_service_install - tags: [ 'sdi_service' ] - diff --git a/smartgears/sdmx_datasource_service/defaults/main.yml b/smartgears/sdmx_datasource_service/defaults/main.yml deleted file mode 100644 index e3951014..00000000 --- a/smartgears/sdmx_datasource_service/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -sdmx_datasource_service_install: False -sdmx_datasource_service_upgrade: False -sdmx_datasource_service_version: latest -sdmx_datasource_service_name: sdmx-datasource-service - -sdmx_datasource_group_id: org.gcube.data.publishing -sdmx_datasource_extension: war -sdmx_datasource_service_file: '{{ sdmx_datasource_service_name }}-{{ sdmx_datasource_service_version }}.{{ sdmx_datasource_extension }}' - diff --git a/smartgears/sdmx_datasource_service/tasks/main.yml b/smartgears/sdmx_datasource_service/tasks/main.yml deleted file mode 100644 index 21656935..00000000 --- a/smartgears/sdmx_datasource_service/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old service files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ sdmx_datasource_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ sdmx_datasource_service_name }}.{{ sdmx_datasource_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not sdmx_datasource_service_install - tags: [ 'sdmx_datasource_service' ] - -- block: - - name: Get the sdmx_datasource-service - maven_artifact: artifact_id={{ sdmx_datasource_service_name }} version={{ sdmx_datasource_service_version | default('latest') }} group_id={{ sdmx_datasource_group_id }} extension={{ sdmx_datasource_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ sdmx_datasource_service_file }} - register: sdmx_datasource_service_download - - - name: Remove the old service files - file: path={{ smartgears_instance_path }}/webapps/{{ sdmx_datasource_service_name }} state=absent - when: sdmx_datasource_service_download is changed - - - name: Copy the service war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ sdmx_datasource_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ sdmx_datasource_service_name }}.{{ sdmx_datasource_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: sdmx_datasource_service_install - tags: [ 'sdmx_datasource_service' ] - diff --git a/smartgears/sharelatex_connector/defaults/main.yml b/smartgears/sharelatex_connector/defaults/main.yml deleted file mode 100644 index 1ecf5987..00000000 --- a/smartgears/sharelatex_connector/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -sharelatex_connector_install: False -sharelatex_connector_version: latest -sharelatex_connector_name: sharelatex-connector -sharelatex_connector_group_id: org.gcube.data.access -sharelatex_connector_extension: war -sharelatex_connector_file: '{{ sharelatex_connector_name }}-{{ sharelatex_connector_version }}.{{ sharelatex_connector_extension }}' - diff --git a/smartgears/sharelatex_connector/tasks/main.yml b/smartgears/sharelatex_connector/tasks/main.yml deleted file mode 100644 index 2be1f7f0..00000000 --- a/smartgears/sharelatex_connector/tasks/main.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- block: - - name: Remove the old sharelatex-connector files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }}.{{ sharelatex_connector_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not sharelatex_connector_install - tags: [ 'smartgears', 'sharelatex_connector', 'tomcat' ] - -- block: - - name: Get the sharelatex-connector war - maven_artifact: artifact_id={{ sharelatex_connector_name }} version={{ sharelatex_connector_version | default('latest') }} group_id={{ sharelatex_connector_group_id }} extension={{ sharelatex_connector_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ sharelatex_connector_file }} - register: sharelatex_connector_download - - - name: Remove the old sharelatex-connector files - file: path={{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }} state=absent - when: sharelatex_connector_download is changed - - - name: Create the sharelatex connector webapp directory - file: path={{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Copy the sharelatex_connector war into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ sharelatex_connector_file }} dest={{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }} remote_src=yes force=yes - notify: Restart smartgears - - - name: Unarchive the sharelatex_connector war - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ sharelatex_connector_file }} dest={{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }} creates={{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }}/WEB-INF/lib - notify: Restart smartgears - - - name: Set the sharelatex-connector properties - template: src=sharelatex-web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ sharelatex_connector_name }}/WEB-INF/web.xml - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: sharelatex_connector_install - tags: [ 'smartgears', 'sharelatex_connector', 'tomcat' ] diff --git a/smartgears/sharelatex_connector/templates/sharelatex-web.xml.j2 b/smartgears/sharelatex_connector/templates/sharelatex-web.xml.j2 deleted file mode 100644 index 86fb399f..00000000 --- a/smartgears/sharelatex_connector/templates/sharelatex-web.xml.j2 +++ /dev/null @@ -1,37 +0,0 @@ - - - internalLoginUrl - http://localhost:{{ sharelatex_container_public_port }}/login - - - hostName - {{ sharelatex_hostname }} - - - mongoHost - {{ sharelatex_mongodb_host }} - - - mongoPort - 27017 - - - mongoDatabaseName - {{ sharelatex_mongodb_db }} - - - - org.gcube.data.access.sharelatex.connector.Connector - - - org.gcube.data.access.sharelatex.connector.Connector - /gcube/service/* - - diff --git a/smartgears/sis_geotk_dt_plugin/defaults/main.yml b/smartgears/sis_geotk_dt_plugin/defaults/main.yml deleted file mode 100644 index 93bedc91..00000000 --- a/smartgears/sis_geotk_dt_plugin/defaults/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -sis_geotk_dt_plugin_install: False -sis_geotk_dt_plugin_name: sis-geotk-plugin - -sis_geotk_dt_plugin_group_id : org.gcube.data.transfer -sis_geotk_dt_plugin_artifact_id : '{{ sis_geotk_dt_plugin_name }}' -sis_geotk_dt_plugin_version : latest -sis_geotk_dt_plugin_extension: jar -sis_geotk_dt_plugin_classifier: uberjar -sis_geotk_dt_plugin_uber_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}-{{ sis_geotk_dt_plugin_classifier }}.{{ sis_geotk_dt_plugin_extension }}' -sis_geotk_dt_plugin_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}.{{ sis_geotk_dt_plugin_extension }}' - -catalina_apps_conf: - - { app_name: '{{ data_trasfer_service_name }}', plugin_name: '{{ sis_geotk_dt_plugin_name }}' } diff --git a/smartgears/sis_geotk_dt_plugin/meta/main.yml b/smartgears/sis_geotk_dt_plugin/meta/main.yml deleted file mode 100644 index 2510b86d..00000000 --- a/smartgears/sis_geotk_dt_plugin/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: '../library/roles/smartgears/catalina-app-conf' - diff --git a/smartgears/sis_geotk_dt_plugin/tasks/main.yml b/smartgears/sis_geotk_dt_plugin/tasks/main.yml deleted file mode 100644 index ee15a248..00000000 --- a/smartgears/sis_geotk_dt_plugin/tasks/main.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- block: - - name: Remove the old Sis geotk data transfer plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=absent - - become: True - become_user: '{{ smartgears_user }}' - when: not sis_geotk_dt_plugin_install - tags: [ 'smartgears', 'sis_geotk', 'tomcat' ] - -- block: - - name: Get the Sis geotk data transfer uber jar - maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ sis_geotk_dt_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_uber_file }} verify_checksum=always - register: sis_geotk_download - - - name: Remove the old Sis geotk data transfer plugin - file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=absent - when: sis_geotk_download is changed - - - name: Create the plugin directory inside data transfer - file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=directory - register: sis_geotk_create_dir - - - name: Unarchive the Sis geotk data transfer uber jar to expose its libraries - unarchive: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/ copy=no - when: sis_geotk_create_dir is changed - notify: Restart smartgears - - - name: Get the Sis geotk data transfer jar - maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} keep_name=yes - notify: Restart smartgears - - - name: Remove the Sis geotk uber jar org and META-INF directories - file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/{{ item }} state=absent - with_items: - - org - - 'META-INF' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: sis_geotk_dt_plugin_install - tags: [ 'smartgears', 'sis_geotk', 'tomcat' ] - diff --git a/smartgears/sis_geotk_dt_plugin/vars/main.yml b/smartgears/sis_geotk_dt_plugin/vars/main.yml deleted file mode 100644 index 55d6ab21..00000000 --- a/smartgears/sis_geotk_dt_plugin/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -#data_transfer_service_install: True - diff --git a/smartgears/smart_executor/defaults/main.yml b/smartgears/smart_executor/defaults/main.yml deleted file mode 100644 index 6bfbf8f4..00000000 --- a/smartgears/smart_executor/defaults/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -smart_executor_install: False -remove_smart_executor_install: False -smart_executor_context: /smart-executor - -smart_executor_version: latest -smart_executor_name: smart-executor -smart_executor_extension: war -smart_executor_group_id: org.gcube.vremanagement -smart_executor_file: '{{ smart_executor_name }}-{{ smart_executor_version }}.{{ smart_executor_extension }}' -smart_executor_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}' - diff --git a/smartgears/smart_executor/tasks/main.yml b/smartgears/smart_executor/tasks/main.yml deleted file mode 100644 index 1a778a8f..00000000 --- a/smartgears/smart_executor/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- block: - - name: Remove the old smart executor files if we want it deinstalled - file: path={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }} state=absent - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not smart_executor_install or remove_smart_executor_install - tags: [ 'smartgears', 'smart_executor', 'tomcat' ] - -- block: - # NOTE: Install as the smartgears user so we do not mess with the permissions - - name: Get the smart executor service war - maven_artifact: artifact_id={{ smart_executor_name }} version={{ smart_executor_version | default('latest') }} group_id={{ smart_executor_group_id }} extension={{ smart_executor_extension | default('war') }} repository_url={{ smart_executor_url }} dest={{ smartgears_downloads_dir }}/{{ smart_executor_file }} verify_checksum=always - register: smartexecutor_download - - - name: Remove the old smart executor files if an upgrade is planned - file: path={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }} state=absent - when: smartexecutor_download is changed - - - name: Create the smart executor working directory - file: path={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Unarchive the smartexecutor distribution - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ smart_executor_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }} creates={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: smart_executor_install - tags: [ 'smartgears', 'smart_executor', 'tomcat' ] diff --git a/smartgears/smartgears-base-image/defaults/main.yml b/smartgears/smartgears-base-image/defaults/main.yml deleted file mode 100644 index 2b12f874..00000000 --- a/smartgears/smartgears-base-image/defaults/main.yml +++ /dev/null @@ -1,33 +0,0 @@ -repo_type: "repo_groups" -repo: "gcube-staging-all" -patch_common_scope: 0 -patch_common_authorization: 0 - -#smartgears_user: "tomcat7" -#smartgears_user_home: "/usr/share/tomcat7/" -smartgears_user: "root" -smartgears_user_home: "/root/" - -smartgears_distribution_version: "2.1.3-4.7.0-154641" -smartgears_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/smartgears-distribution/{{ smartgears_distribution_version }}/smartgears-distribution-{{ smartgears_distribution_version }}.tar.gz" -smartgears_log_dir: "/var/log/tomcat7" -smartgears_log_max_history: 30 -smartgears_log_max_file_size: 10MB -smartgears_log_total_file_cap: 500MB -smartgears_loglevel: "WARN" -smartgears_log_use_timesize_appender: True - -orchestrator_user: "orchestrator" -orchestrator_ssh_key: -#orchestrator_ssh_key: "ssh-rsa placeholder orchestrator@placeholder" - -java_jdk: "java8-jdk" #### either java8-jdk or openjdk-8 -java_home: "/usr/lib/jvm/java-8-oracle" -catalina_home: "/usr/share/tomcat7" -catalina_opts: "-Xmx2000m -Xms2000m -XX:MaxPermSize=512M" -tomcat_port: 8080 - -image_name: "smartgears-base-image-{{ java_jdk }}" -#image_tag: "latest" #{{ smartgears_distribution_version }} -image_tag: "{{ smartgears_distribution_version }}" -push_to_repo: "no" diff --git a/smartgears/smartgears-base-image/files/common-authorization-patched.jar b/smartgears/smartgears-base-image/files/common-authorization-patched.jar deleted file mode 100644 index ef72face..00000000 Binary files a/smartgears/smartgears-base-image/files/common-authorization-patched.jar and /dev/null differ diff --git a/smartgears/smartgears-base-image/files/common-scope-maps-patched.jar b/smartgears/smartgears-base-image/files/common-scope-maps-patched.jar deleted file mode 100644 index 15c2afdd..00000000 Binary files a/smartgears/smartgears-base-image/files/common-scope-maps-patched.jar and /dev/null differ diff --git a/smartgears/smartgears-base-image/files/smartgears_run.sh b/smartgears/smartgears-base-image/files/smartgears_run.sh deleted file mode 100755 index cca86672..00000000 --- a/smartgears/smartgears-base-image/files/smartgears_run.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -#################################################################### -#### Written by Daniele Pavia (ENG) -#### configures the container.xml, runs the default tomcat instance -#### and executes the ssh server in foreground to enable ansible -#### provisioning while keeping the container alive -#################################################################### - -#### let's configure the container -#### if no token is set refuse to run -if [[ -z "$CONTAINER_TOKENS" ]]; - then - echo "CONTAINER_TOKENS not set, failed to configure the container. Exiting with errors."; - exit 1 - else - OLDIFS=$IFS - IFS="," - read -r -a tokens <<< "$CONTAINER_TOKENS" - for token in ${tokens[@]}; - do - sed -i "/gcube<\/infrastructure>/a \\\t$token<\/token>" container.xml; - done - IFS=$OLDIFS -fi - -if [[ -z "$CONTAINER_MODE" ]]; - then - echo "CONTAINER_MODE not set, assuming default value."; - else - sed -i "s///" container.xml; -fi - -if [[ -z "$CONTAINER_HOSTNAME" ]]; - then - echo "CONTAINER_HOSTNAME not set, assuming default value."; - else - sed -i "s/localhost<\/hostname>/$CONTAINER_HOSTNAME<\/hostname>/" container.xml; -fi - -if [[ -z "$CONTAINER_PORT" ]]; - then - echo "CONTAINER_PORT not set, assuming default value."; - else - sed -i "s/8080<\/port>/$CONTAINER_PORT<\/port>/" container.xml; -fi - -if [[ -z "$CONTAINER_INFRASTRUCTURE" ]]; - then - echo "CONTAINER_INFRASTRUCTURE not set, assuming default value."; - else - sed -i "s/gcube<\/infrastructure>/$CONTAINER_INFRASTRUCTURE<\/infrastructure>/" container.xml; -fi - -if [[ $PATCH_COMMON_SCOPES = "1" ]]; - then - rm ./lib/common-scope-maps-*; - mv common-scope-maps-patched.jar ./lib/ -fi - -if [[ $PATCH_COMMON_AUTHORIZATION = "1" ]]; - then - rm ./lib/common-authorization-*; - mv common-authorization-patched.jar ./lib/ -fi -echo "Container configuration done" - -#### let's start tomcat. Ignore its status after the start. -echo "Starting Tomcat7" -service tomcat7 start - -echo "Starting ssh server in foreground" -/usr/sbin/sshd -D diff --git a/smartgears/smartgears-base-image/meta/main.yml b/smartgears/smartgears-base-image/meta/main.yml deleted file mode 100644 index 106a9fc4..00000000 --- a/smartgears/smartgears-base-image/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: - - role: "../../docker/" -# - role: java-17 diff --git a/smartgears/smartgears-base-image/tasks/main.yml b/smartgears/smartgears-base-image/tasks/main.yml deleted file mode 100644 index 0789730d..00000000 --- a/smartgears/smartgears-base-image/tasks/main.yml +++ /dev/null @@ -1,33 +0,0 @@ -- name: create temporary build directory - shell: mktemp -d - register: tempdir - -- name: copy the Dockerfile - template: src=Dockerfile dest="{{ tempdir.stdout }}/" - -- name: copy the logback configuration - template: src=logback.xml.j2 dest="{{ tempdir.stdout }}/logback.xml" - -- name: copy the startup script - copy: src=smartgears_run.sh dest="{{ tempdir.stdout }}/" mode=0755 - -- name: copy the pacthed common-scope-maps jar - copy: src=common-scope-maps-patched.jar dest="{{ tempdir.stdout }}/" mode=0755 - when: patch_common_scope != 0 - -- name: copy the pacthed common-authorization jar - copy: src=common-authorization-patched.jar dest="{{ tempdir.stdout }}/" mode=0755 - when: patch_common_authorization != 0 - -- name: Build the docker image - docker_image: - path: "{{ tempdir.stdout }}" - name: "{{ image_name }}" - tag: "{{ image_tag }}" - state: present - force: yes - rm: True - push: "{{ push_to_repo }}" - -- name: remove the temporary build directory - file: path="{{ tempdir.stdout }}" state=absent diff --git a/smartgears/smartgears-base-image/templates/Dockerfile b/smartgears/smartgears-base-image/templates/Dockerfile deleted file mode 100644 index 8e24eaee..00000000 --- a/smartgears/smartgears-base-image/templates/Dockerfile +++ /dev/null @@ -1,75 +0,0 @@ -FROM ubuntu:14.04 - -ENV JAVA_HOME {{ java_home }} -ENV CATALINA_HOME {{ catalina_home }} -ENV GHN_HOME {{ smartgears_user_home }} - -WORKDIR {{ smartgears_user_home }} -ADD {{ smartgears_url }} {{ smartgears_user_home }} -ADD smartgears_run.sh {{ smartgears_user_home }} - -{% if patch_common_scope %} - COPY common-scope-maps-patched.ja* {{ smartgears_user_home }} -{% endif %} - -{% if patch_common_authorization %} - COPY common-authorization-patched.ja* {{ smartgears_user_home }} -{% endif %} - -RUN \ - #### install either the Oracle JDK or OpenJDK - apt-get update && \ - apt-get install -y software-properties-common && \ - {% if java_jdk == 'java8-jdk' %} - echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ - add-apt-repository -y ppa:webupd8team/java && \ - apt-get update && \ - apt-get install -y oracle-java8-installer && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /var/cache/oracle-jdk8-installer && \ - {% elif java_jdk == 'openjdk-8' %} - apt-add-repository -y ppa:openjdk-r/ppa && \ - apt-get update && \ - apt-get install -y openjdk-8-jdk-headless && \ - {% endif %} - - apt-get update && apt-get install -y tomcat7 openssh-client openssh-server python wget && \ - ln -s /var/lib/tomcat7/webapps/ /usr/share/tomcat7/webapps && \ - sed -ie 's/^TOMCAT7_USER=tomcat7/TOMCAT7_USER={{ smartgears_user }}/' /etc/default/tomcat7 && \ - sed -ie 's/^TOMCAT7_GROUP=tomcat7/TOMCAT7_GROUP={{ smartgears_user }}/' /etc/default/tomcat7 && \ - - #### set the default JDK for tomcat - {% if java_jdk == 'java8-jdk' %} - echo "JAVA_HOME=/usr/lib/jvm/java-8-oracle/" >> /etc/default/tomcat7 && \ - {% elif java_jdk == 'openjdk-8' %} - echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/" >> /etc/default/tomcat7 && \ - {% endif %} - - echo GHN_HOME={{ smartgears_user_home }} >> /etc/default/tomcat7 && \ - echo CATALINA_HOME={{ catalina_home }} >> /etc/default/tomcat7 && \ - echo CATALINA_OPTS=\"{{ catalina_opts }}\" >> /etc/default/tomcat7 && \ - ln -s /etc/init.d/tomcat7 /etc/init.d/tomcat-instance-9000 && \ - sed -i 's/8080/{{ tomcat_port }}/' /var/lib/tomcat7/conf/server.xml && \ - mkdir /var/run/sshd && \ - - #### if an orchestrator ssh key is specified then add it to the authorized_keys - {% if orchestrator_ssh_key is defined %} - mkdir -p ~/.ssh/ && touch ~/.ssh/authorized_keys && \ - echo "{{ orchestrator_ssh_key }}" >> ~/.ssh/authorized_keys && \ - echo "{{ orchestrator_user }} ALL=(ALL) ALL" >> /etc/sudoers && \ - {% endif %} - - #### is this pem required? - wget -O /usr/local/share/ca-certificates/infn-ca-2015.crt https://security.fi.infn.it/CA/mgt/INFNCA.pem && \ - tar xzvf smartgears-distribution-{{ smartgears_distribution_version }}.tar.gz - -WORKDIR {{ smartgears_user_home }}/smartgears-distribution-{{ smartgears_distribution_version }}/ -RUN \ - ./install -s tomcat - -COPY logback.xml {{ smartgears_user_home }}/lib/ - -WORKDIR {{ smartgears_user_home }} - -EXPOSE 22 8080 -ENTRYPOINT ["{{ smartgears_user_home }}/smartgears_run.sh"] diff --git a/smartgears/smartgears-base-image/templates/logback.xml.j2 b/smartgears/smartgears-base-image/templates/logback.xml.j2 deleted file mode 100644 index 9f822160..00000000 --- a/smartgears/smartgears-base-image/templates/logback.xml.j2 +++ /dev/null @@ -1,139 +0,0 @@ - - - {{ smartgears_log_dir }}/ghn.log - true - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/ghn.%d{yyyy-MM-dd}.%i.log - {{ smartgears_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_dir }}/ghn.%d{yyyy-MM-dd}.log - {{ smartgears_log_max_history }} - -{% endif %} - - - - {{ smartgears_log_dir }}/accounting.log - true - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/accounting.%d{yyyy-MM-dd}.%i.log - {{ smartgears_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_dir }}/accounting.%d{yyyy-MM-dd}.log - {{ smartgears_log_max_history }} - -{% endif %} - - - - {{ smartgears_log_dir }}/access.log - true - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/access.%d{yyyy-MM-dd}.%i.log - {{ smartgears_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_dir }}/access.%d{yyyy-MM-dd}.log - {{ smartgears_log_max_history }} - -{% endif %} - - -{% if dataminer_app_install is defined and dataminer_app_install %} - - {{ smartgears_log_dir }}/analysis.log - true - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/analysis.%d{yyyy-MM-dd}.%i.log - {{ smartgears_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_max_file_size }} - {{ smartgears_log_dir }}/analysis.%d{yyyy-MM-dd}.log - {{ smartgears_log_max_history }} - -{% endif %} - - - - - - - - -{% endif %} - -{% if smartgears_appender_list is defined %} -{% for obj in smartgears_appender_list %} - - /home/gcube/tomcat/logs/{{ obj.appender_file_name }}.log - true - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - - - /home/gcube/tomcat/logs/{{ obj.appender_file_name | default('custom') }}.%d{yyyy-MM-dd}.%i.log - {{ obj.appender_maxHistory | default('30') }} - {{ obj.appender_maxFileSize | default('10MB') }} - {{ obj.appender_totalSizeCap | default('2GB') }} - - - - - -{% endfor %} -{% endif %} - - - - - - - - - - - - - - - - - - - - - - - diff --git a/smartgears/smartgears-container-bootstrap/defaults/main.yml b/smartgears/smartgears-container-bootstrap/defaults/main.yml deleted file mode 100644 index 6e03c1eb..00000000 --- a/smartgears/smartgears-container-bootstrap/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ -smartgears_container_name: "smartgears_base_container" -smartgears_image: "smartgears_base_image" -image_version: "{{ smartgears_distribution_version }}" -container_ssh_port: 2222 -tomcat_port: 8080 - -smartgear_tokens: "c8610c1b-4293-4ed4-ad53-f2aeaf4fbeb8-97827" -container_mode: "online" -container_hostname: "shinyproxy" -container_infrastructure: "d4s" diff --git a/smartgears/smartgears-container-bootstrap/tasks/main.yml b/smartgears/smartgears-container-bootstrap/tasks/main.yml deleted file mode 100644 index cbb27325..00000000 --- a/smartgears/smartgears-container-bootstrap/tasks/main.yml +++ /dev/null @@ -1,20 +0,0 @@ -#### runs/replaces a smartgears container with the provided params -- name: run a smartgears container based on the "{{ smartgears_image }}" image - docker_container: - name: "{{ smartgears_container_name }}" - state: started - image: "{{ smartgears_image }}:{{ image_version }}" - #pull: True - recreate: yes - detach: True - env: - CONTAINER_TOKENS: "{{ smartgear_tokens }}" - CONTAINER_MODE: "{{ container_mode }}" - CONTAINER_HOSTNAME: "{{ container_hostname }}" - CONTAINER_PORT: "{{ tomcat_port }}" - CONTAINER_INFRASTRUCTURE: "{{ container_infrastructure }}" - PATCH_COMMON_SCOPES: "{{ patch_common_scope }}" - PATCH_COMMON_AUTHORIZATION: "{{ patch_common_authorization }}" - published_ports: - - "{{ container_ssh_port }}:22" - - "{{ tomcat_port }}:{{ tomcat_port }}" diff --git a/smartgears/smartgears-container-home-library/defaults/main.yml b/smartgears/smartgears-container-home-library/defaults/main.yml deleted file mode 100644 index 070554ee..00000000 --- a/smartgears/smartgears-container-home-library/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ -java_jdk: "java8-jdk" #### either java8-jdk or openjdk-8 -image_name: "smartgears-home-library" -image_tag: "{{ home_library_war_version }}" -push_to_repo: "no" -repo: "gcube-staging" - -home_library_artifact_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/data/access/home-library-webapp/{{ home_library_war_version }}/home-library-webapp-{{ home_library_war_version }}.war" -catalina_home: "/usr/share/tomcat7/" diff --git a/smartgears/smartgears-container-home-library/tasks/main.yml b/smartgears/smartgears-container-home-library/tasks/main.yml deleted file mode 100644 index 9c395032..00000000 --- a/smartgears/smartgears-container-home-library/tasks/main.yml +++ /dev/null @@ -1,20 +0,0 @@ -- name: create temporary build directory - shell: mktemp -d - register: tempdir - -- name: copy the Dockerfile - template: src=Dockerfile dest="{{ tempdir.stdout }}/" - -- name: Build the docker image - docker_image: - path: "{{ tempdir.stdout }}" - name: "{{ image_name }}" - tag: "{{ image_tag }}" - state: present - force: yes - rm: True - pull: False - push: "{{ push_to_repo }}" - -- name: remove the temporary build directory - file: path="{{ tempdir.stdout }}" state=absent diff --git a/smartgears/smartgears-container-home-library/templates/Dockerfile b/smartgears/smartgears-container-home-library/templates/Dockerfile deleted file mode 100644 index 1b1d21f2..00000000 --- a/smartgears/smartgears-container-home-library/templates/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM smartgears-base-image-{{ java_jdk }}:{{ smartgears_distribution_version }} - -ADD {{ home_library_artifact_url }} "{{ catalina_home }}/webapps/" diff --git a/smartgears/smartgears-generic-service/defaults/main.yml b/smartgears/smartgears-generic-service/defaults/main.yml deleted file mode 100644 index 1e6a6236..00000000 --- a/smartgears/smartgears-generic-service/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -smartgears_generic_service_install: False -smartgears_generic_service_version: latest -smartgears_generic_service_extension: war - -smartgears_generic_service_file: '{{ smartgears_generic_service_name }}-{{ smartgears_generic_service_version }}.{{ smartgears_generic_service_extension }}' - diff --git a/smartgears/smartgears-generic-service/tasks/main.yml b/smartgears/smartgears-generic-service/tasks/main.yml deleted file mode 100644 index 6590716e..00000000 --- a/smartgears/smartgears-generic-service/tasks/main.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- block: - - name: Remove the old service files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ smartgears_generic_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ smartgears_generic_service_name }}.{{ smartgears_generic_service_extension }}' - notify: Restart smartgears - check_mode: yes - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears_generic_service' ] - when: not smartgears_generic_service_install - -- block: - - name: Get the smartgears-service war - maven_artifact: artifact_id={{ smartgears_generic_service_name }} version={{ smartgears_generic_service_version | default(omit) }} group_id={{ smartgears_generic_service_group_id }} extension={{ smartgears_generic_service_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ smartgears_generic_service_file }} verify_checksum=always - register: smartgears_generic_service_download - - - name: Remove the old service files - file: path={{ smartgears_instance_path }}/webapps/{{ smartgears_generic_service_name }} state=absent - notify: Restart smartgears - when: smartgears_generic_service_download is changed - check_mode: yes - - - name: Copy the service under the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ smartgears_generic_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ smartgears_generic_service_name }}.{{ smartgears_generic_service_extension }} remote_src=yes force=yes - notify: Restart smartgears - check_mode: yes - - - name: Create the service webapp directory - file: dest={{ smartgears_instance_path }}/webapps/{{ smartgears_generic_service_name }} state=directory - when: smartgears_generic_service_download - - - name: Unarchive the service war file - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ smartgears_generic_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ smartgears_generic_service_name }} - notify: Restart smartgears - - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears_generic_service' ] - when: smartgears_generic_service_install - check_mode: yes - diff --git a/smartgears/smartgears-nginx-frontend/defaults/main.yml b/smartgears/smartgears-nginx-frontend/defaults/main.yml deleted file mode 100644 index 5c363ec0..00000000 --- a/smartgears/smartgears-nginx-frontend/defaults/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -setup_nginx: False -http_redirect_to_https: False -letsencrypt_acme_install: False -smartgears_install_generic_virthost: True -smartgears_install_common_nginx_virthualhost: False -#smartgears_nginx_serveraliases: -smartgears_nginx_cors_enabled: False -nginx_cors_acl_origin: '' -smartgears_tomcat_manager_exposed: False -smartgears_tomcat_manager_access_acls: - - { policy: 'allow', address: '0.0.0.0/0' } - -# You can use smartgears_special_redirect to redirect whatever URL to another one, even changing the hostname (it must be an alias of the machine hostname if you want to maintain it local) -#smartgears_special_redirect: -# - { source_uri: '/', dest_host: 'hostname-alias', dest_url: 'service-url'} - -smartgears_nginx_expose_tomcat_logs: False -smartgears_nginx_rw_html_root: False - -smartgears_nginx_virtualhosts: - - virthost_name: '{{ smartgears_tomcat_servername }}' - smartgears_id: '{{ smartgears_instance_id }}' - #listen: '{{ http_port }}' - server_name: '{{ smartgears_tomcat_servername }}' - ssl_enabled: True - ssl_only: '{{ http_redirect_to_https }}' - ssl_letsencrypt_certs: '{{ nginx_letsencrypt_managed }}' - smartgears_over_ssl: False - smartgears_http_port: '{{ smartgears_http_port }}' - root: '{{ smartgears_web_document_root }}' - server_tokens: 'off' - index: index.html index.do - max_body: '{{ nginx_client_max_body_size }}' - user: '{{ smartgears_user }}' - proxy_standard_setup: True -# locations: -# - location: /yam -# other_opts: -# - 'try_files $uri $uri/ $uri.php$is_args$query_string' -# - location: ~ \.php$ -# php_target: '{{ phpfpm_listen_host }}:{{ phpfpm_listen_port }}' diff --git a/smartgears/smartgears-nginx-frontend/meta/main.yml b/smartgears/smartgears-nginx-frontend/meta/main.yml deleted file mode 100644 index f1749521..00000000 --- a/smartgears/smartgears-nginx-frontend/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: '../../library/roles/nginx' diff --git a/smartgears/smartgears-nginx-frontend/tasks/main.yml b/smartgears/smartgears-nginx-frontend/tasks/main.yml deleted file mode 100644 index c3acabc5..00000000 --- a/smartgears/smartgears-nginx-frontend/tasks/main.yml +++ /dev/null @@ -1,78 +0,0 @@ ---- -# Install the nginx virtualhosts -# If bot smartgears_install_generic_virthost and smartgears_install_common_nginx_virthualhost are True, we prefer the latter -- block: - - name: Install the nginx generic virtualhost - template: src=nginx-smartgears-virtualhost.j2 dest=/etc/nginx/sites-available/{{ item.virthost_name }} owner=root group=root mode=0444 - with_items: '{{ smartgears_nginx_virtualhosts }}' - notify: Reload nginx - - - name: Enable the smartgears nginx virtualhosts - file: src=/etc/nginx/sites-available/{{ item.virthost_name }} dest=/etc/nginx/sites-enabled/smartgears_{{ item.smartgears_id }}.conf state=link - with_items: '{{ smartgears_nginx_virtualhosts }}' - when: item.smartgears_id is defined - notify: Reload nginx - - - name: Enable the non smartgears nginx virtualhosts - file: src=/etc/nginx/sites-available/{{ item.virthost_name }} dest=/etc/nginx/sites-enabled/smartgears_{{ item.virthost_name }}.conf state=link - with_items: '{{ smartgears_nginx_virtualhosts }}' - when: item.smartgears_id is not defined - notify: Reload nginx - - - name: Give the smartgears user access to the document root, and create it if needed - file: dest={{ item.root}} state=directory owner={{ item.user }} group={{ item.user }} mode=0755 - with_items: '{{ smartgears_nginx_virtualhosts }}' - when: - - smartgears_nginx_rw_html_root - - item.user is defined - notify: Reload nginx - tags: [ 'nginx', 'virtualhost', 'web_root' ] - - tags: [ 'nginx', 'virtualhost' ] - when: smartgears_install_common_nginx_virthualhost - -- block: - - name: Install the nginx generic virtualhost (old, to be replaced by a newer template) - template: src=generic-smartgears-virtualhost.j2 dest=/etc/nginx/sites-available/{{ item.servername }} owner=root group=root mode=0444 - with_items: '{{ tomcat_m_instances }}' - when: smartgears_install_generic_virthost - notify: Reload nginx - tags: [ 'nginx', 'virtualhost' ] - - - name: Install the nginx virtualhost, if a specific one has been defined - template: src={{ item.servername }}-virtualhost.j2 dest=/etc/nginx/sites-available/{{ item.servername }} owner=root group=root mode=0444 - with_items: '{{ tomcat_m_instances }}' - when: not smartgears_install_generic_virthost - notify: Reload nginx - tags: [ 'nginx', 'virtualhost' ] - - - name: Enable the nginx virtualhosts (old style) - file: src=/etc/nginx/sites-available/{{ item.servername }} dest=/etc/nginx/sites-enabled/smartgears_{{ item.smartgears_id }}.conf state=link - with_items: '{{ tomcat_m_instances }}' - notify: Reload nginx - tags: [ 'nginx', 'virtualhost' ] - - - name: Give the smartgears user access to the document root, and create it if needed (old style) - file: dest={{ item.web_document_root}} state=directory owner={{ item.user }} group={{ item.user }} mode=0755 - with_items: '{{ tomcat_m_instances }}' - when: smartgears_nginx_rw_html_root - notify: Reload nginx - tags: [ 'nginx', 'virtualhost', 'web_root' ] - - when: not smartgears_install_common_nginx_virthualhost - tags: [ 'nginx', 'virtualhost' ] - - -- block: - - name: Remove the old hostname based virtualhost filename - file: dest=/etc/nginx/sites-enabled/{{ item.servername }}.conf state=absent - with_items: '{{ tomcat_m_instances }}' - notify: Reload nginx - - - name: Remove the old ubuntu.conf virtualhost filename - file: dest=/etc/nginx/sites-enabled/ubuntu.conf state=absent - with_items: '{{ tomcat_m_instances }}' - notify: Reload nginx - - tags: [ 'nginx', 'virtualhost' ] - diff --git a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 deleted file mode 100644 index ab309e2c..00000000 --- a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 +++ /dev/null @@ -1,374 +0,0 @@ -server { - listen {{ http_port }}; -{% if letsencrypt_acme_install %} - include /etc/nginx/snippets/letsencrypt-proxy.conf; -{% endif %} - location ~ /\.(?!well-known).* { - deny all; - access_log off; - log_not_found off; - return 404; - } - - client_max_body_size {{ nginx_client_max_body_size | default('100M') }}; -{% if egi_image is defined and egi_image %} - # No servername into the EGI images -{% elif hostname is defined %} - server_name _; -{% else %} - server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %}; -{% endif %} - access_log /var/log/nginx/{{ item.servername }}_access.log; - error_log /var/log/nginx/{{ item.servername }}_error.log; - root {{ item.web_document_root | default('/usr/share/nginx/html/') }}; - - {% if haproxy_ips is defined %} - # We are behind haproxy - {% for ip in haproxy_ips %} - set_real_ip_from {{ ip }}; - {% endfor %} - real_ip_header X-Forwarded-For; - {% endif %} - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # don't send the nginx version number in error pages and Server header - server_tokens off; - - {% if nginx_client_body_temp_dir is defined %} - client_body_temp_path {{ nginx_client_body_temp_dir }} 1 2; - {% endif %} - - # Proxy stuff - include /etc/nginx/snippets/nginx-proxy-params.conf; - {% if nginx_websockets_support %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - {% endif %} - - {% if r_connector_install is defined and r_connector_install %} - location /auth-sign-in { - rewrite ^/auth-sign-in http://{{ item.servername }}/r-connector/gcube/service/disconnect; - } - {% endif %} - location /whn-manager { - proxy_pass http://127.0.0.1:{{ item.http_port }}/whn-manager; - } -{% if not http_redirect_to_https %} - {% for instance in tomcat_m_instances %} - {% for context in instance.app_contexts %} - {% if context != "whn-manager" %} - {% if context != "uri-resolver" %} - {% if context != '' %} - location /{{ context }} { - {% if varnish_install is defined and varnish_install %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ item.http_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ item.http_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ item.http_port }}/{{ context }}; - {% endif %} - {% endif %} - } - {% endif %} - {% endif %} - {% endif %} - {% endfor %} - {% endfor %} - {% if smart_executor_install is defined and smart_executor_install %} - location {{ smart_executor_context }} { - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}{{ smart_executor_context }}; - } - {% endif %} - {% if data_transfer_service_install %} - location /data-transfer-service { - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/data-transfer-service; - } - {% endif %} - {% if tomcat_m_manager_install or tomcat_m_host_manager_install %} - {% if smartgears_tomcat_manager_exposed %} - location /manager { - {% for acl in smartgears_tomcat_manager_access_acls %} - {{ acl.policy }} {{ acl.address }}; - {% endfor %} - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/manager; - } - {% endif %} - {% endif %} - - {% if remote_opencpu_server is defined and remote_opencpu_server %} - location {{ opencpu_context | default('/ocpu') }} { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://{{ remote_opencpu_host }}:{{ opencpu_proxy_port | default('8004') }}{{ opencpu_context | default('/ocpu') }}; - } - {% endif %} - - {% if smartgears_nginx_expose_tomcat_logs %} - location /gcube-logs/ { - alias {{ smartgears_instance_path }}/logs/; - autoindex on; - autoindex_localtime on; - } - {% endif %} - - {% if rstudio_install_server is defined and rstudio_install_server %} - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://127.0.0.1:8787/; - } - {% endif %} - - {% if smartgears_uri_resolver_install is defined and smartgears_uri_resolver_install %} - location /geonetwork { - {% for ip in ckan_ip_list %} - allow {{ ip }}; - {% endfor %} - deny all; - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/uri-resolver/geonetwork; - } - - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - rewrite ^ $request_uri; - rewrite ^/(.*) uri-resolver/$1 break; - return 400; #if the second rewrite won't match - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/$uri; - } - {% endif %} - {% if smartgears_special_redirect is defined %} - {% for target in smartgears_special_redirect %} - location {{ target.source_uri }} { - return 301 http://{{ target.dest_host }}/{{ target.dest_url }}; - } - {% endfor %} - {% endif %} - -{% else %} - location / { - return 301 https://{{ item.servername }}$request_uri; - } -{% endif %} -} - -{% if letsencrypt_acme_install %} -server { - listen {{ https_port }} ssl; - location ~ /\.(?!well-known).* { - deny all; - access_log off; - log_not_found off; - return 404; - } - - client_max_body_size {{ nginx_client_max_body_size | default('100M') }}; -{% if egi_image is defined and egi_image %} - # No servername into the EGI images -{% elif hostname is defined %} - server_name _; -{% else %} - server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %}; -{% endif %} - - access_log /var/log/nginx/{{ item.servername }}_access_ssl.log; - error_log /var/log/nginx/{{ item.servername }}_error_ssl.log; - - root {{ item.web_document_root | default('/usr/share/nginx/html/') }}; - - {% if haproxy_ips is defined %} - # We are behind haproxy - {% for ip in haproxy_ips %} - set_real_ip_from {{ ip }}; - {% endfor %} - real_ip_header X-Forwarded-For; - {% endif %} - - include /etc/nginx/snippets/nginx-server-ssl.conf; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # don't send the nginx version number in error pages and Server header - server_tokens off; - - {% if nginx_client_body_temp_dir is defined %} - client_body_temp_path {{ nginx_client_body_temp_dir }} 1 2; - {% endif %} - - # Proxy stuff - include /etc/nginx/snippets/nginx-proxy-params.conf; - {% if nginx_websockets_support %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - {% endif %} - {% if r_connector_install is defined and r_connector_install %} - location /auth-sign-in { - rewrite ^/auth-sign-in http://{{ item.servername }}/r-connector/gcube/service/disconnect; - } - {% endif %} - location /whn-manager { - proxy_pass http://127.0.0.1:{{ item.http_port }}/whn-manager; - } - {% for instance in tomcat_m_instances %} - {% for context in instance.app_contexts %} - {% if context != "whn-manager" %} - {% if context != "uri-resolver" %} - {% if context != '' %} - location /{{ context }} { - {% if varnish_install is defined and varnish_install %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ item.http_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ item.http_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ item.http_port }}/{{ context }}; - {% endif %} - {% endif %} - } - {% endif %} - {% endif %} - {% endif %} - {% endfor %} - {% endfor %} - {% if smart_executor_install is defined and smart_executor_install %} - location {{ smart_executor_context }} { - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}{{ smart_executor_context }}; - } - {% endif %} - {% if data_transfer_service_install %} - location /data-transfer-service { - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/data-transfer-service; - } - {% endif %} - {% if tomcat_m_manager_install or tomcat_m_host_manager_install %} - {% if smartgears_tomcat_manager_exposed %} - location /manager { - {% for acl in smartgears_tomcat_manager_access_acls %} - {{ acl.policy }} {{ acl.address }}; - {% endfor %} - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/manager; - } - {% endif %} - {% endif %} - {% if remote_opencpu_server is defined and remote_opencpu_server %} - location {{ opencpu_context | default('/ocpu') }} { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://{{ remote_opencpu_host }}:{{ opencpu_proxy_port | default('8004') }}{{ opencpu_context | default('/ocpu') }}; - } - {% endif %} - - {% if smartgears_nginx_expose_tomcat_logs %} - location /gcube-logs/ { - alias {{ smartgears_instance_path }}/logs/; - autoindex on; - autoindex_localtime on; - } - {% endif %} - - {% if rstudio_install_server is defined and rstudio_install_server %} - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://127.0.0.1:8787/; - } - {% endif %} - - {% if smartgears_uri_resolver_install is defined and smartgears_uri_resolver_install %} - location /geonetwork { - {% for ip in ckan_ip_list %} - allow {{ ip }}; - {% endfor %} - deny all; - rewrite ^ $request_uri; - rewrite ^/(.*) uri-resolver/$1 break; - return 400; #if the second rewrite won't match - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/$uri; - } - - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - rewrite ^ $request_uri; - rewrite ^/(.*) uri-resolver/$1 break; - return 400; #if the second rewrite won't match - proxy_pass http://127.0.0.1:{{ smartgears_http_port }}/$uri; - } - {% endif %} - {% if smartgears_special_redirect is defined %} - {% for target in smartgears_special_redirect %} - location {{ target.source_uri }} { - return 301 https://{{ target.dest_host }}/{{ target.dest_url }}; - } - {% endfor %} - {% endif %} -} -{% endif %} diff --git a/smartgears/smartgears-nginx-frontend/templates/nginx-smartgears-virtualhost.j2 b/smartgears/smartgears-nginx-frontend/templates/nginx-smartgears-virtualhost.j2 deleted file mode 100644 index e59b6811..00000000 --- a/smartgears/smartgears-nginx-frontend/templates/nginx-smartgears-virtualhost.j2 +++ /dev/null @@ -1,631 +0,0 @@ -{% if nginx_websockets_support is defined and nginx_websockets_support %} -include /etc/nginx/snippets/nginx-websockets.conf; -{% elif item.websockets is defined and item.websockets %} -include /etc/nginx/snippets/nginx-websockets.conf; -{% endif %} - -server { - listen {{ item.listen | default ('80') }}; -{% if egi_image is defined and egi_image %} - # No servername into the EGI images -{% elif hostname is defined %} - server_name _; -{% else %} - server_name {{ item.server_name }} {% if item.serveraliases is defined %}{{ item.serveraliases }}{% endif %}; -{% endif %} - -{% if letsencrypt_acme_install %} - include /etc/nginx/snippets/letsencrypt-proxy.conf; -{% endif %} - - location ~ /\.(?!well-known).* { - deny all; - access_log off; - log_not_found off; - return 404; - } - - {% if item.access_log is defined %} - access_log {{ item.access_log }}; - {% else %} - access_log /var/log/nginx/{{ item.virthost_name }}_access.log; - {% endif %} - - {% if item.error_log is defined %} - error_log {{ item.error_log }}; - {% else %} - error_log /var/log/nginx/{{ item.virthost_name }}_error.log; - {% endif %} - - server_tokens {{ item.server_tokens | default('off') }}; - -{% if item.ssl_enabled and item.ssl_only %} -{% if item.smartgears_over_ssl is defined and item.smartgears_over_ssl %} - location / { - return 301 https://{{ item.server_name }}$request_uri; - } -{% else %} - {% if item.smartgears_id is defined %} - # Smartgears answers over http - include /etc/nginx/snippets/nginx-proxy-params.conf; - {% if r_connector_install is defined and r_connector_install %} - location /auth-sign-in { - rewrite ^/auth-sign-in http://{{ item.virthost_name }}/r-connector/gcube/service/disconnect; - } - {% endif %} - location /whn-manager { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/whn-manager; - } - - {% if smart_executor_install is defined and smart_executor_install %} - location {{ smart_executor_context }} { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}{{ smart_executor_context }}; - } - {% endif %} - {% if data_transfer_service_install %} - location /data-transfer-service { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/data-transfer-service; - } - {% endif %} - {% endif %} - - location / { - return 301 https://{{ item.server_name }}$request_uri; - } -{% endif %} -{% else %} - - root {{ item.root | default('/usr/share/nginx/html/') }}; - index {{ item.index | default('index.html index.htm') }}; - error_page 500 502 503 504 {{ item.error_page | default('/50x.html') }}; - location = /50x.html { - root /usr/share/nginx/html; - } - location = /favicon.ico { - log_not_found off; - access_log off; - } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - location ~ /\. { - deny all; - access_log off; - log_not_found off; - return 404; - } - {% if haproxy_ips is defined %} - # We are behind haproxy - {% for ip in haproxy_ips %} - set_real_ip_from {{ ip }}; - {% endfor %} - real_ip_header X-Forwarded-For; - {% endif %} - - {% if item.max_body is defined %} - client_max_body_size {{ item.max_body }}; - {% else %} - client_max_body_size {{ nginx_client_max_body_size }}; - {% endif %} - - {% if item.body_timeout is defined %} - client_body_timeout {{ item.body_timeout }}; - {% else %} - client_body_timeout {{ nginx_client_body_timeout }}; - {% endif %} - - {% if nginx_cors_enabled %} - {% if nginx_cors_global %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - {% endif %} - - {% if item.additional_options is defined %} - {% for add_opt in item.additional_options %} - {{ add_opt }}; - {% endfor %} - {% endif %} - - {% if item.http_acls is defined %} - {% for acl in item.http_acls %} - {{ acl }}; - {% endfor %} - {% endif %} - - {% if nginx_websockets_support is defined and nginx_websockets_support %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - {% elif item.websockets is defined and item.websockets %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - {% endif %} - - include /etc/nginx/snippets/nginx-proxy-params.conf; - {% if item.proxy_additional_options is defined %} - {% for popt in item.proxy_additional_options %} - {{ popt }}; - {% endfor %} - {% endif %} - - {% if item.smartgears_id is defined %} - # Smartgears special urls - start - {% if r_connector_install is defined and r_connector_install %} - location /auth-sign-in { - rewrite ^/auth-sign-in http://{{ item.virthost_name }}/r-connector/gcube/service/disconnect; - } - {% endif %} - location /whn-manager { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/whn-manager; - } - - {% if smart_executor_install is defined and smart_executor_install %} - location {{ smart_executor_context }} { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}{{ smart_executor_context }}; - } - {% endif %} - {% if data_transfer_service_install %} - location /data-transfer-service { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/data-transfer-service; - } - {% endif %} - # Smartgears special urls - end - - # Smartgears targets - start - {% for instance in tomcat_m_instances %} - {% for context in instance.app_contexts %} - {% if context != "whn-manager" %} - {% if context != "uri-resolver" %} - {% if context != '' %} - location /{{ context }} { - {% if varnish_install is defined and varnish_install %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/{{ context }}; - {% endif %} - {% endif %} - } - {% endif %} - {% endif %} - {% endif %} - {% endfor %} - {% endfor %} - {% if smart_executor_install is defined and smart_executor_install %} - location {{ smart_executor_context }} { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}{{ smart_executor_context }}; - } - {% endif %} - {% if data_transfer_service_install %} - location /data-transfer-service { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/data-transfer-service; - } - {% endif %} - {% if tomcat_m_manager_install or tomcat_m_host_manager_install %} - {% if smartgears_tomcat_manager_exposed %} - location /manager { - {% for acl in smartgears_tomcat_manager_access_acls %} - {{ acl.policy }} {{ acl.address }}; - {% endfor %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/manager; - } - {% endif %} - {% endif %} - {% if remote_opencpu_server is defined and remote_opencpu_server %} - location {{ opencpu_context | default('/ocpu') }} { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://{{ remote_opencpu_host }}:{{ opencpu_proxy_port | default('8004') }}{{ opencpu_context | default('/ocpu') }}; - } - {% endif %} - - {% if smartgears_nginx_expose_tomcat_logs %} - location /gcube-logs/ { - alias {{ smartgears_instance_path }}/logs/; - autoindex on; - autoindex_localtime on; - } - {% endif %} - - {% if rstudio_install_server is defined and rstudio_install_server %} - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://127.0.0.1:8787/; - } - {% endif %} - - {% if smartgears_uri_resolver_install is defined and smartgears_uri_resolver_install %} - location /geonetwork { - {% for ip in ckan_ip_list %} - allow {{ ip }}; - {% endfor %} - deny all; - rewrite ^ $request_uri; - rewrite ^/(.*) uri-resolver/$1 break; - return 400; #if the second rewrite won't match - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/$uri; - } - - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - rewrite ^ $request_uri; - rewrite ^/(.*) uri-resolver/$1 break; - return 400; #if the second rewrite won't match - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/$uri; - } - {% endif %} - # Smartgears targets - end - {% endif %} - - {% if item.locations is defined %} - {% for location in item.locations -%} - - location {{ location.location }} { - - {% if nginx_cors_enabled %} - {% if not nginx_cors_global %} - {% if location.cors is defined and location.cors %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - {% endif %} - {% endif %} - - {% if location.target is defined %} - proxy_pass {{ location.target }}; - {% elif location.php_target is defined %} - try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass {{ location.php_target }}; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param REMOTE_ADDR $http_x_forwarded_for; - #fastcgi_param REMOTE_ADDR $remote_addr; - include fastcgi_params; - {% endif %} - - {% if location.websockets is defined and location.websockets %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - {% endif %} - - {% if location.extra_conf is defined %} - {{ location.extra_conf }} - {% endif %} - - {% if location.acls is defined %} - {% for acl in location.acls %} - {{ acl }}; - {% endfor %} - {% endif %} - - {% if location.other_opts is defined %} - {% for opt in location.other_opts %} - {{ opt }}; - {% endfor %} - {% endif %} - } - {% endfor %} - {% endif %} - - {% if item.extra_parameters is defined %} - {{ item.extra_parameters }} - {% endif %} - -{% endif %} -} - -{% if item.ssl_enabled %} -server { - listen {{ https_port | default('443') }} {{ nginx_ssl_type }}; -{% if egi_image is defined and egi_image %} - # No servername into the EGI images -{% elif hostname is defined %} - server_name _; -{% else %} - server_name {{ item.server_name }} {% if item.serveraliases is defined %}{{ item.serveraliases }}{% endif %}; -{% endif %} - - location ~ /\.(?!well-known).* { - deny all; - access_log off; - log_not_found off; - return 404; - } - - {% if item.access_log is defined %} - access_log {{ item.access_log }}; - {% else %} - access_log /var/log/nginx/{{ item.virthost_name }}_ssl_access.log; - {% endif %} - - {% if item.error_log is defined %} - error_log {{ item.error_log }}; - {% else %} - error_log /var/log/nginx/{{ item.virthost_name }}_ssl_error.log; - {% endif %} - - root {{ item.root | default('/usr/share/nginx/html/') }}; - index {{ item.index | default('index.html index.htm') }}; - error_page 500 502 503 504 {{ item.error_page | default('/50x.html') }}; - location = /50x.html { - root /usr/share/nginx/html; - } - location = /favicon.ico { - log_not_found off; - access_log off; - } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - location ~ /\.(?!well-known).* { - deny all; - access_log off; - log_not_found off; - return 404; - } - - {% if haproxy_ips is defined %} - # We are behind haproxy - {% for ip in haproxy_ips %} - set_real_ip_from {{ ip }}; - {% endfor %} - real_ip_header X-Forwarded-For; - {% endif %} - - {% if item.max_body is defined %} - client_max_body_size {{ item.max_body }}; - {% else %} - client_max_body_size {{ nginx_client_max_body_size }}; - {% endif %} - {% if item.body_timeout is defined %} - client_body_timeout {{ item.body_timeout }}; - {% else %} - client_body_timeout {{ nginx_client_body_timeout }}; - {% endif %} - - include /etc/nginx/snippets/nginx-server-ssl.conf; - - server_tokens {{ item.server_tokens | default('off') }}; - - {% if nginx_cors_enabled %} - {% if nginx_cors_global %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - {% endif %} - - {% if nginx_websockets_support is defined and nginx_websockets_support %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - {% elif item.websockets is defined and item.websockets %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - {% endif %} - - {% if item.additional_options is defined %} - {% for add_opt in item.additional_options %} - {{ add_opt }}; - {% endfor %} - {% endif %} - - {% if item.https_acls is defined %} - {% for acl in item.https_acls %} - {{ acl }}; - {% endfor %} - {% endif %} - - include /etc/nginx/snippets/nginx-proxy-params.conf; - - {% if item.proxy_additional_options is defined %} - {% for popt in item.proxy_additional_options %} - {{ popt }} - {% endfor %} - {% endif %} - - {% if item.smartgears_id is defined %} - # Smartgears special urls - start - {% if r_connector_install is defined and r_connector_install %} - location /auth-sign-in { - rewrite ^/auth-sign-in http://{{ item.virthost_name }}/r-connector/gcube/service/disconnect; - } - {% endif %} - location /whn-manager { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/whn-manager; - } - - {% if smart_executor_install is defined and smart_executor_install %} - location {{ smart_executor_context }} { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}{{ smart_executor_context }}; - } - {% endif %} - {% if data_transfer_service_install %} - location /data-transfer-service { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/data-transfer-service; - } - {% endif %} - # Smartgears special urls - end - - # Smartgears targets - start - {% for instance in tomcat_m_instances %} - {% for context in instance.app_contexts %} - {% if context != "whn-manager" %} - {% if context != "uri-resolver" %} - {% if context != '' %} - location /{{ context }} { - {% if varnish_install is defined and varnish_install %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ varnish_listen_port }}/{{ context }}; - {% endif %} - {% else %} - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% if nginx_cors_extended_rules %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}; - {% else %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/{{ context }}; - {% endif %} - {% else %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/{{ context }}; - {% endif %} - {% endif %} - } - {% endif %} - {% endif %} - {% endif %} - {% endfor %} - {% endfor %} - {% if smart_executor_install is defined and smart_executor_install %} - location {{ smart_executor_context }} { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}{{ smart_executor_context }}; - } - {% endif %} - {% if data_transfer_service_install %} - location /data-transfer-service { - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/data-transfer-service; - } - {% endif %} - {% if tomcat_m_manager_install or tomcat_m_host_manager_install %} - {% if smartgears_tomcat_manager_exposed %} - location /manager { - {% for acl in smartgears_tomcat_manager_access_acls %} - {{ acl.policy }} {{ acl.address }}; - {% endfor %} - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/manager; - } - {% endif %} - {% endif %} - {% if remote_opencpu_server is defined and remote_opencpu_server %} - location {{ opencpu_context | default('/ocpu') }} { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://{{ remote_opencpu_host }}:{{ opencpu_proxy_port | default('8004') }}{{ opencpu_context | default('/ocpu') }}; - } - {% endif %} - - {% if smartgears_nginx_expose_tomcat_logs %} - location /gcube-logs/ { - alias {{ smartgears_instance_path }}/logs/; - autoindex on; - autoindex_localtime on; - } - {% endif %} - - {% if rstudio_install_server is defined and rstudio_install_server %} - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - proxy_pass http://127.0.0.1:8787/; - } - {% endif %} - - {% if smartgears_uri_resolver_install is defined and smartgears_uri_resolver_install %} - location /geonetwork { - {% for ip in ckan_ip_list %} - allow {{ ip }}; - {% endfor %} - deny all; - rewrite ^ $request_uri; - rewrite ^/(.*) uri-resolver/$1 break; - return 400; #if the second rewrite won't match - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/$uri; - } - - location / { - {% if smartgears_nginx_cors_enabled %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - rewrite ^ $request_uri; - rewrite ^/(.*) uri-resolver/$1 break; - return 400; #if the second rewrite won't match - proxy_pass http://127.0.0.1:{{ item.smartgears_http_port }}/$uri; - } - {% endif %} - # Smartgears targets - end - {% endif %} - - {% if item.locations is defined %} - {% for location in item.locations -%} - location {{ location.location }} { - - {% if nginx_cors_enabled %} - {% if not nginx_cors_global %} - {% if location.cors is defined and location.cors %} - include /etc/nginx/snippets/nginx-cors.conf; - {% endif %} - {% endif %} - {% endif %} - - {% if location.target is defined %} - proxy_pass {{ location.target }}; - {% elif location.php_target is defined %} - try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass {{ location.php_target }}; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param REMOTE_ADDR $http_x_forwarded_for; - #fastcgi_param REMOTE_ADDR $remote_addr; - include fastcgi_params; - {% endif %} - - {% if location.websockets is defined and location.websockets %} - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - {% endif %} - - {% if location.extra_conf is defined %} - {{ location.extra_conf }} - {% endif %} - - {% if location.acls is defined %} - {% for acl in location.acls %} - {{ acl }}; - {% endfor %} - {% endif %} - - {% if location.other_opts is defined %} - {% for opt in location.other_opts %} - {{ opt }}; - {% endfor %} - {% endif %} - } - {% endfor %} - {% endif %} - - {% if item.extra_parameters is defined %} - {{ item.extra_parameters }} - {% endif %} -} -{% endif %} diff --git a/smartgears/smartgears-service/meta/main.yml b/smartgears/smartgears-service/meta/main.yml deleted file mode 100644 index b94071c6..00000000 --- a/smartgears/smartgears-service/meta/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -dependencies: - - { role: '../../library/roles/smartgears/smartgears' } - - { role: '../../library/roles/smartgears/smartgears-nginx-frontend', when: setup_nginx is defined and setup_nginx } - - { role: '../../library/roles/smartgears/resource_updater', when: resource_updater_install is defined } - - { role: '../../library/roles/d4s_user_services_perms', when: smartgears_node } - - role: '../../library/roles/ssh-keys' diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml deleted file mode 100644 index 96281e61..00000000 --- a/smartgears/smartgears/defaults/main.yml +++ /dev/null @@ -1,115 +0,0 @@ ---- -gcube_repository: 'gcube-staging' -smartgears_gcube_repository: '{{ gcube_repository }}' -# Set it to true from the command line when you want to upgrade a -# distribution version -smartgears_upgrade: False -smartgears_force_install: False -smartgears_force_remove_state: False - -smartgears_node: True -smartgears_install_generic_virthost: True - -smartgears_data_fs: /home -smartgears_user: '{{ d4science_user }}' -smartgears_user_home: '{{ d4science_user_home }}' -smartgears_downloads_dir: '{{ d4science_user_home }}/downloads' -smartgears_instance_path: '{{ smartgears_user_home }}/tomcat' -smartgears_install_path: '{{ smartgears_user_home }}/SmartGears' -#smartgears_distribution_version: 2.2.0-4.12.1-162179 -smartgears_distribution_version: latest -smartgears_global_base_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}' -smartgears_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ smartgears_gcube_repository }}' - -# Change to 'True' when the stable version will be >= 2.2.0-4.13.1 -smartgears_set_protocol_in_conf: False - -smartgears_name: smartgears-distribution -smartgears_group_id: org.gcube.distribution -smartgears_extension: tar.gz -smartgears_file: '{{ smartgears_name }}-{{ smartgears_distribution_version }}.{{ smartgears_extension }}' -smartgears_skip_get_scopes: False - -smartgears_mode: online -smartgears_application_mode: online -# Production infra -smartgears_infrastructure_name: "d4science.research-infrastructures.eu" -# Production VOs -smartgears_production_vo: - - '/{{ smartgears_infrastructure_name }}' - - '/{{ smartgears_infrastructure_name }}/FARM' - - '/{{ smartgears_infrastructure_name }}/SoBigData' - - '/{{ smartgears_infrastructure_name }}/SmartArea' - - '/{{ smartgears_infrastructure_name }}/gCubeApps' - - '/{{ smartgears_infrastructure_name }}/D4Research' - - '/{{ smartgears_infrastructure_name }}/D4OS' - - '/{{ smartgears_infrastructure_name }}/OpenAIRE' - -# Set to 'true' or 'false'. Pay attention to the case -smartgears_authorized_on_all_scopes: 'false' -smartgears_merge_scopes: True -smartgears_scopes: - - '/{{ smartgears_infrastructure_name }}' -smartgears_hostname: '{{ ansible_fqdn }}' -smartgears_country: it -smartgears_location: pisa -smartgears_latitude: 41.9000 -smartgears_longitude: 12.5000 -smartgears_publication_frequency: 300 -smartgears_http_port: 9000 -smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}' - -smartgears_log_use_timesize_appender: True -smartgears_logback_conf_autoscan: 'true' -smartgears_logback_conf_debug: 'false' -smartgears_loglevel: WARN -smartgears_accounting_log_level: ERROR -smartgears_dataanalysis_loglevel: DEBUG -smartgears_dataanalysis_log_max_history: 90 -smartgears_log_max_history: 30 -smartgears_log_max_file_size: 10MB -smartgears_log_total_file_cap: 2GB -smartgears_log_dir: '{{ smartgears_user_home }}/tomcat/logs' -smartgears_tomcat_tmp_dir: '{{ smartgears_user_home }}/tomcat/tmp' -smartgears_logback_template: True - -smartgears_tomcat_contexts: [ '' ] -smartgears_tomcat_listen_address: '127.0.0.1' -smartgears_tomcat_servername: '{{ ansible_fqdn }}' - -# The iptables rules use this -http_port: '{{ smartgears_http_port }}' - -# Used by nginx -smartgears_web_document_root: '/usr/share/nginx/html/' - -smartgears_tomcat_m_webapps_unpack: True -smartgears_tomcat_m_instances: - - { http_enabled: True, http_port: '{{ smartgears_http_port }}', http_address: '{{ smartgears_tomcat_listen_address }}', ajp_enabled: False, ajp_port: '8109', ajp_address: '127.0.0.1', restart_timeout: '{{ tomcat_m_restart_timeout }}', shutdown_port: '-1', java_home: '{{ jdk_java_home }}', user: '{{ smartgears_user }}', user_home: '{{ smartgears_user_home }}', user_shell: '{{ tomcat_m_default_user_shell }}', instance_path: '{{ smartgears_instance_path }}', max_threads: '{{ tomcat_m_max_threads }}', autodeploy: '{{ tomcat_m_webapps_autodeploy }}', unpack: '{{ tomcat_m_webapps_unpack }}', default_conf: True, java_opts: '{{ tomcat_m_java_opts }}', java_gc_opts: '{{ tomcat_m_java_gc_opts }}', other_java_opts: '{{ tomcat_m_other_java_opts }}', jmx_enabled: '{{ tomcat_m_jmx_enabled }}', jmx_disable_additional_ports: '{{ tomcat_m_jmx_disable_additional_ports }}', jmx_port: '{{ tomcat_m_jmx_port }}', jmx_use_ssl: '{{ tomcat_m_jmx_use_ssl }}', jmx_auth_enabled: '{{ tomcat_m_jmx_auth_enabled }}', jmx_auth_dir: '{{ tomcat_m_instances_base_path }}/{{ smartgears_http_port }}/conf', jmx_monitorpass: '{{ tomcat_m_jmx_monitorpass | default(omit) }}', jmx_controlpass: '{{ tomcat_m_jmx_controlpass | default(omit) }}', catalina_tmp_directory: '{{ smartgears_tomcat_tmp_dir }}', remote_debugging: '{{ tomcat_m_enable_remote_debugging }}', remote_debugging_uri: '{{ smartgears_debugging_uri }}', access_log_enabled: True, log_rotation_freq: daily, log_retain: 30, allowed_hosts: [ '0.0.0.0/0' ], app_contexts: '{{ smartgears_tomcat_contexts }}', web_document_root: '{{ smartgears_web_document_root }}' , skip_smartgears: False, smartgears_id: '{{ smartgears_instance_id }}', servername: '{{ smartgears_tomcat_servername }}' } - -smartgears_additional_data_directories: - - { name: '{{ d4science_user_home }}', perms: 0755, create: False, owner: 'root', group: '{{ common_users_group }}', aclperms: 'rX' } - - { name: '{{ d4science_user_home }}/tomcat/lib/logback.xml', perms: 0644, create: False, owner: 'root', group: '{{ common_users_group }}', aclperms: 'rwX' } - - { name: '/etc/default/tomcat-instance-{{ smartgears_http_port }}', perms: 0644, create: False, owner: 'root', group: '{{ common_users_group }}', aclperms: 'rX' } - - { name: '/etc/default/tomcat-instance-{{ smartgears_http_port }}.local', perms: 0644, create: False, owner: 'root', group: '{{ common_users_group }}', aclperms: 'rX' } - - { name: '/var/log', create: False, perms: 0755, owner: 'root', group: '{{ common_users_group }}', aclperms: 'rX' } - -# To enable debugging: -# - Set -# tomcat_m_enable_remote_debugging: True -# Rerun the playbook using --tags=tomcat_default -# -smartgears_debugging_host: '{{ tomcat_m_remote_debugging_host }}' -smartgears_debugging_port: '{{ tomcat_m_remote_debugging_port }}' -smartgears_debugging_uri: '{{ tomcat_m_remote_debugging_uri }}' -# iptables: -# tcp_rules: True -# tcp: -# - { port: '{{ smartgears_debugging_port }}', allowed_hosts: [ '{{ network.isti }}', '{{ network.nmis }}', '{{ network.eduroam }}' ] } - -# This is only used to setup the nginx reverse proxy and the service configuration. -# The data-trasfer war file is always installed -data_transfer_service_install: False -data_trasfer_service_name: data-transfer-service -data_transfer_set_local_persistence: False - diff --git a/smartgears/smartgears/files/TokenGenerator.class b/smartgears/smartgears/files/TokenGenerator.class deleted file mode 100644 index 1d0e1014..00000000 Binary files a/smartgears/smartgears/files/TokenGenerator.class and /dev/null differ diff --git a/smartgears/smartgears/handlers/main.yml b/smartgears/smartgears/handlers/main.yml deleted file mode 100644 index a9b4ffdd..00000000 --- a/smartgears/smartgears/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Restart smartgears - service: name='tomcat-instance-{{ smartgears_http_port }}' state=restarted diff --git a/smartgears/smartgears/meta/main.yml b/smartgears/smartgears/meta/main.yml deleted file mode 100644 index a30f4a7d..00000000 --- a/smartgears/smartgears/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: '../../library/roles/tomcat-multiple-instances' diff --git a/smartgears/smartgears/tasks/data-transfer-service.yml b/smartgears/smartgears/tasks/data-transfer-service.yml deleted file mode 100644 index 7764fb05..00000000 --- a/smartgears/smartgears/tasks/data-transfer-service.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: Create the data transfer webapp directory - become: True - become_user: '{{ smartgears_user }}' - file: path={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }} state=directory - when: data_transfer_service_install - tags: [ 'smartgears', 'smartgears_data_trasfer', 'tomcat' ] - -- name: Unarchive the data transfer webapp directory - become: True - become_user: '{{ smartgears_user }}' - unarchive: src={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}.war dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }} creates={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/gcube-app.xml remote_src=yes - when: data_transfer_service_install - tags: [ 'smartgears', 'smartgears_data_trasfer', 'tomcat' ] - -- name: Install the gcube-app file used by the data-transfer-service - become: True - become_user: '{{ smartgears_user }}' - template: src=data-transfer-gcube-app.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/gcube-app.xml - when: data_transfer_service_install - notify: Restart smartgears - tags: [ 'smartgears', 'smartgears_data_trasfer', 'tomcat' ] - diff --git a/smartgears/smartgears/tasks/install-gcube-keys.yml b/smartgears/smartgears/tasks/install-gcube-keys.yml deleted file mode 100644 index db3e53df..00000000 --- a/smartgears/smartgears/tasks/install-gcube-keys.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- block: - - name: Install the production gcube keys - get_url: url={{ item.url }} dest={{ gcube_tomcat_lib_dir }}/{{ item.name }} owner={{ smartgears_user }} group={{ d4science_user }} mode=0600 - with_items: '{{ gcube_production_security_keys }}' - notify: Restart smartgears - when: install_gcube_prod_key - - - name: Remove the production gcube keys - file: dest={{ gcube_tomcat_lib_dir }}/{{ item.name }} state=absent - with_items: '{{ gcube_production_security_keys }}' - notify: Restart smartgears - when: not install_gcube_prod_key - - - name: Install the devel gcube keys - get_url: url={{ item.url }} dest={{ gcube_tomcat_lib_dir }}/{{ item.name }} owner={{ smartgears_user }} group={{ d4science_user }} mode=0600 - with_items: '{{ gcube_dev_security_keys }}' - notify: Restart smartgears - when: install_gcube_dev_key - - - name: Remove the devel gcube keys - file: dest={{ gcube_tomcat_lib_dir }}/{{ item.name }} state=absent - with_items: '{{ gcube_dev_security_keys }}' - notify: Restart smartgears - when: not install_gcube_dev_key - - - name: Install the preprod gcube keys - get_url: url={{ item.url }} dest={{ gcube_tomcat_lib_dir }}/{{ item.name }} owner={{ smartgears_user }} group={{ smartgears_user }} mode=0600 - with_items: '{{ gcube_preprod_security_keys }}' - notify: Restart smartgears - when: install_gcube_preprod_key - - - name: Remove the preprod gcube keys - file: dest={{ gcube_tomcat_lib_dir }}/{{ item.name }} state=absent - with_items: '{{ gcube_preprod_security_keys }}' - notify: Restart smartgears - when: not install_gcube_preprod_key - - - name: Remove the obsolete or expired gcube keys - file: dest={{ gcube_tomcat_lib_dir }}/{{ item.name }} state=absent - with_items: '{{ gcube_old_security_keys }}' - notify: Restart smartgears - - #become: True - #become_user: '{{ smartgears_user }}' - tags: gcube_key diff --git a/smartgears/smartgears/tasks/main.yml b/smartgears/smartgears/tasks/main.yml deleted file mode 100644 index 7434edbf..00000000 --- a/smartgears/smartgears/tasks/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- import_tasks: set_jdk_home.yml -- import_tasks: smartgears-app.yml -- import_tasks: data-transfer-service.yml - when: data_transfer_service_install -- import_tasks: install-gcube-keys.yml - diff --git a/smartgears/smartgears/tasks/set_jdk_home.yml b/smartgears/smartgears/tasks/set_jdk_home.yml deleted file mode 100644 index a4c98f12..00000000 --- a/smartgears/smartgears/tasks/set_jdk_home.yml +++ /dev/null @@ -1,62 +0,0 @@ ---- -- block: - - name: Are we using the distribution OpenJDK? - stat: - path: /usr/lib/jvm/java-{{ openjdk_default }}-openjdk-amd64 - register: jdk_java_home_path - when: openjdk_default is defined - - - debug: - msg: 'The jdk java home is {{ jdk_java_home_path.stat.path }}' - when: jdk_java_home_path.stat.path is defined - - - name: Set the Java home when we are using the distribution OpenJDK - set_fact: - jdk_java_home: '{{ jdk_java_home_path.stat.path }}' - when: jdk_java_home_path.stat.isdir is defined and jdk_java_home_path.stat.isdir - - when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- block: - - name: Are we using the Zulu OpenJDK? - stat: - path: /usr/lib/jvm/zulu-{{ openjdk_default }}-amd64 - register: jdk_java_home_path - when: openjdk_default is defined - - - debug: - msg: 'The jdk java home is {{ jdk_java_home_path.stat.path }}' - when: jdk_java_home_path.stat.path is defined - - - name: Set the Java home when we are using the distribution OpenJDK - set_fact: - jdk_java_home: '{{ jdk_java_home_path.stat.path }}' - when: jdk_java_home_path.stat.isdir is defined and jdk_java_home_path.stat.isdir - - when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- block: - - name: Are we using the Oracle JDK? - stat: - path: /usr/lib/jvm/java-{{ jdk_default }}-oracle - register: jdk_java_home_path - - - debug: - msg: 'The jdk java home is {{ jdk_java_home_path.stat.path }}' - when: jdk_java_home_path.stat.path is defined - - - name: Set the Java home when we are using the Oracle JDK - set_fact: - jdk_java_home: '{{ jdk_java_home_path.stat.path }}' - when: jdk_java_home_path.stat.isdir is defined and jdk_java_home_path.stat.isdir - - when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Fail if we are not able to set the jdk_java_home variable - fail: - msg: 'No valid JDK installation found, failing!' - when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] diff --git a/smartgears/smartgears/tasks/smartgears-app.yml b/smartgears/smartgears/tasks/smartgears-app.yml deleted file mode 100644 index b0d67bbb..00000000 --- a/smartgears/smartgears/tasks/smartgears-app.yml +++ /dev/null @@ -1,173 +0,0 @@ ---- -- name: Create a directory where to store all the smartgears related downloads to avoid cluttering the home directory - file: dest={{ smartgears_downloads_dir }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'smartgears_download_dir', 'smartgears_downloads_dir', 'smartgears_conf' ] - -- name: Remove the old smartgears-distribution files under the smartgears user home directory. - shell: rm -fr {{ smartgears_user_home }}/smartgears-distribution-* ; touch {{ smartgears_user_home }}/.smartgears_distribution_cleaned - args: - creates: '{{ smartgears_user_home }}/.smartgears_distribution_cleaned' - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] - -- name: Get the smartgears distribution - become: True - become_user: '{{ smartgears_user }}' - maven_artifact: artifact_id={{ smartgears_name }} version={{ smartgears_distribution_version | default('latest') }} group_id={{ smartgears_group_id }} extension={{ smartgears_extension | default('tar.gz') }} repository_url={{ smartgears_url }} dest={{ smartgears_downloads_dir }}/{{ smartgears_file }} verify_checksum=always - with_items: '{{ tomcat_m_instances }}' - register: smartgears_download - when: not item.skip_smartgears - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat'] - -- name: Remove the smartgears-distribution files - shell: find {{ smartgears_downloads_dir }} -maxdepth 1 -type d -name smartgears-distribution-* -exec rm -fr {} \; - ignore_errors: yes - when: smartgears_download is changed - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat'] - -- name: Unarchive the smartgears distribution - become: True - become_user: '{{ smartgears_user }}' - unarchive: remote_src=yes src={{ smartgears_downloads_dir }}/{{ smartgears_file }} dest={{ smartgears_downloads_dir }} - with_items: '{{ tomcat_m_instances }}' - when: - - not item.skip_smartgears - - smartgears_download is changed - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] - -- name: Check if the smartgears stop script exists - become: True - become_user: '{{ smartgears_user }}' - stat: path={{ smartgears_user_home }}/stopContainer.sh - when: smartgears_upgrade or ( smartgears_download is changed ) - register: smartgears_stop_script - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'stop_smartgears_service' ] - -- name: Stop the smartgears container before launching the upgrade script - become: True - become_user: '{{ smartgears_user }}' - shell: '{{ smartgears_user_home }}/stopContainer.sh' - when: - - smartgears_upgrade or ( smartgears_download is changed ) - - smartgears_stop_script.stat.exists - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'stop_smartgears_service' ] - -- name: Install the additional tomcat default file - template: src=tomcat-instance-default.j2 dest=/etc/default/tomcat-instance-{{ item.http_port }}.local - with_items: '{{ tomcat_m_instances }}' - when: not item.skip_smartgears - notify: Restart smartgears - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'smartgears_env' ] - -- name: Set the additional tomcat default file as the smartgears user .bashrc - become: True - become_user: '{{ smartgears_user }}' - template: src=tomcat-instance-default.j2 dest={{ item.user_home }}/.bashrc mode=0444 - with_items: '{{ tomcat_m_instances }}' - when: not item.skip_smartgears - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'smartgears_env' ] - -- name: Install the smartgears app - become: True - become_user: '{{ smartgears_user }}' - shell: cd {{ smartgears_downloads_dir }} ; dest_dir=$( find . -type d -name smartgears-distribution-\* | tail -1 ) ; cd $dest_dir ; . /{{ item.user_home }}/.bashrc ; ./install -s tomcat - with_items: '{{ tomcat_m_instances }}' - when: - - smartgears_download is changed - - not item.skip_smartgears - register: install_smartgears_app - notify: Restart smartgears - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] - -- name: Create the directory where we put the smartgears configuration snippets - become: True - become_user: '{{ smartgears_user }}' - file: dest={{ smartgears_user_home }}/.containerxml state=directory - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Install the token generator class - copy: src=TokenGenerator.class dest=/usr/local/lib/TokenGenerator.class owner=root group=root mode=0644 - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Install the smartgears logback configuration - become: True - become_user: '{{ smartgears_user }}' - template: src=logback.xml.j2 dest={{ smartgears_instance_path }}/lib/logback.xml mode=0644 - when: smartgears_logback_template - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat', 'logback_conf' ] - -- name: Remove some wrong symbolic links created by the install/upgrade script - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_install_path }}/lib/lib' - - '{{ smartgears_install_path }}/apps/webapps' - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Install the script that fetches the scope tokens - template: src=get-scopes.j2 dest=/usr/local/bin/get-scopes owner=root group={{ smartgears_user }} mode=0750 - with_items: '{{ tomcat_m_instances }}' - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Install the file containing the scopes list - template: src=scopes.list.j2 dest=/usr/local/etc/scopes.list owner=root group={{ smartgears_user }} mode=0444 - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Get the real smartgears version from the container.xml file contained inside the distribution - shell: dest_dir=$( find {{ smartgears_downloads_dir }} -type d -name smartgears-distribution-\* | tail -1 ) ; cd $dest_dir ; grep "'SmartGearsDistribution' " container.xml | awk -F "'" '{print $4}' - register: smartgears_real_version - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'smartgears_conf' ] - -- name: Print the smartgears version - debug: - msg: "The smartgears version is: {{ smartgears_real_version.stdout }}" - when: smartgears_real_version is defined - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'smartgears_conf' ] - -- name: Set the real smartgears distribution version - set_fact: smartgears_real_distribution_version="{{ smartgears_real_version.stdout }}" - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'smartgears_conf' ] - -- name: Put the smartgears version into a file - copy: content={{ smartgears_real_distribution_version }} dest={{ smartgears_user_home }}/SMARTGEARS_VERSION - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat', 'smartgears_conf' ] - -- name: Install the smartgears template configuration. First part - become: True - become_user: '{{ smartgears_user }}' - template: src=container.xml.j2 dest={{ smartgears_user_home }}/.containerxml/1-container.xml - with_items: '{{ tomcat_m_instances }}' - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Install the smartgears template configuration file. Third part - become: True - become_user: '{{ smartgears_user }}' - template: src=container-end.xml.j2 dest={{ smartgears_user_home }}/.containerxml/3-container.xml - with_items: '{{ tomcat_m_instances }}' - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Get the scope tokens from the authorization service and assemble the container.xml file when whe have an authorization token or we are upgrading - become: True - become_user: '{{ smartgears_user }}' - shell: /usr/local/bin/get-scopes {{ gcube_admin_token | default('') }} - notify: Restart smartgears - when: not smartgears_skip_get_scopes - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Remove the smartgears application state if requested - become: True - become_user: '{{ smartgears_user }}' - file: dest={{ smartgears_install_path }}/state state=absent - when: smartgears_force_remove_state - notify: Restart smartgears - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Force a smartgears restart - service: name='tomcat-instance-{{ smartgears_http_port }}' state=restarted - when: smartgears_force_restart is defined and smartgears_force_restart - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - -- name: Install the Nagios NRPE configuration for smartgears - template: src=smartgears-nrpe.cfg.j2 dest=/etc/nagios/nrpe.d/smartgears-nrpe.cfg owner=root group=root mode=444 - notify: Reload NRPE server - when: nagios_enabled - tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_nrpe', 'nagios', 'nagios_nrpe' ] - diff --git a/smartgears/smartgears/templates/change-logback-loglevel.sh.j2 b/smartgears/smartgears/templates/change-logback-loglevel.sh.j2 deleted file mode 100644 index 2ddebe2c..00000000 --- a/smartgears/smartgears/templates/change-logback-loglevel.sh.j2 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -RETVAL= -LOGLEVEL=$( xmlstarlet sel -t -v "/configuration/logger/@level" {{ item.user_home }}/tomcat/lib/logback.xml | grep {{ smartgears_loglevel }} ) -RETVAL=$? - -if [ $RETVAL -ne 0 ] ; then - xmlstarlet ed -u "/configuration/logger[@level]/@level" -v {{ smartgears_loglevel }} {{ item.user_home }}/tomcat/lib/logback.xml > {{ item.user_home }}/tomcat/lib/logback.xml.new - /bin/mv {{ item.user_home }}/tomcat/lib/logback.xml.new {{ item.user_home }}/tomcat/lib/logback.xml -fi - -exit 0 - diff --git a/smartgears/smartgears/templates/container-end.xml.j2 b/smartgears/smartgears/templates/container-end.xml.j2 deleted file mode 100644 index 41e32629..00000000 --- a/smartgears/smartgears/templates/container-end.xml.j2 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/smartgears/smartgears/templates/container.xml.j2 b/smartgears/smartgears/templates/container.xml.j2 deleted file mode 100644 index b27fa965..00000000 --- a/smartgears/smartgears/templates/container.xml.j2 +++ /dev/null @@ -1,35 +0,0 @@ - - - {% if hostname is defined %} - {{ hostname }} - {% else %} - {{ smartgears_hostname }} - {% endif %} - {% if setup_nginx %} - {{ http_port }} - {% else %} - {%if http_port is defined %} - {{ http_port }} - {% else %} - {{ item.http_port }} - {% endif %} - {% endif %} - {% if smartgears_set_protocol_in_conf %} - http - {% endif %} - - {{ smartgears_country }} - {{ smartgears_location }} - {{ smartgears_latitude }} - {{ smartgears_longitude }} - - - -{{ smartgears_authorized_on_all_scopes }} - - - - - {{ smartgears_publication_frequency }} - {{ smartgears_infrastructure_name }} - diff --git a/smartgears/smartgears/templates/data-transfer-gcube-app.xml.j2 b/smartgears/smartgears/templates/data-transfer-gcube-app.xml.j2 deleted file mode 100644 index 101711a9..00000000 --- a/smartgears/smartgears/templates/data-transfer-gcube-app.xml.j2 +++ /dev/null @@ -1,17 +0,0 @@ - - {{ data_trasfer_service_name }} - DataTransfer - {{ smartgears_distribution_version }} - "Data Transfer Service" -{% if data_transfer_set_local_persistence %} -{% if smartgears_persistence_location is defined %} - -{% else %} - -{% endif %} -{% else %} - -{% endif %} - - - diff --git a/smartgears/smartgears/templates/get-scopes.j2 b/smartgears/smartgears/templates/get-scopes.j2 deleted file mode 100644 index 614ac2d7..00000000 --- a/smartgears/smartgears/templates/get-scopes.j2 +++ /dev/null @@ -1,196 +0,0 @@ -#!/bin/bash -# -# get-scopes: get smartgears scopes using an authorization token or getting them from the current smartgears state. Or both. -# -# Set the ansible 'smartgears_merge_scopes' variable to 'False' in the playbook run if you do not want to merge the scopes -# -####################### -# -# * token + SMARTGEARS_MERGE_SCOPES boolean set to true (default): we merge the scopes -# - if it is a first install there is no state to merge. Do not fail, only get the playbook scopes -# * token + SMARTGEARS_MERGE_SCOPES boolean set to false: we only use the playbook scopes -# * no token, SMARTGEARS_MERGE_SCOPES boolean set to false: we do nothing - -CONTAINER_XML_HEAD={{ smartgears_user_home }}/.containerxml/1-container.xml -SCOPES_FILE={{ smartgears_user_home }}/.containerxml/2-container.xml -CONTAINER_XML_TAIL={{ smartgears_user_home }}/.containerxml/3-container.xml -LOCAL_LIB=/usr/local/lib -LOCAL_ETC=/usr/local/etc -LOG_PREFIX="get-scopes: " -GHN_ENV_FILE=/etc/default/tomcat-instance-{{ item.http_port }}.local -SMARTGEARS_SAVED_STATE_F=saved_scopes_list.xml -SMARTGEARS_SAVED_STATE_PATH={{ smartgears_user_home }}/SmartGears/$SMARTGEARS_SAVED_STATE_F -SMARTGEARS_SCRIPTS_DIR={{ smartgears_user_home }}/SmartGears/scripts -SMARTGEARS_RUNNING_STATE_FILE={{ smartgears_install_path }}/state/ghn.xml - -{%if setup_nginx %} -HTTP_PORT={{ http_port }} -{% else %} -{%if http_port is defined %} -HTTP_PORT={{ http_port }} -{% else %} -HTTP_PORT={{ item.http_port }} -{% endif %} -{% endif %} - -# True (defaul): merge the scopes. False: do not merge -SMARTGEARS_MERGE_SCOPES="{{ smartgears_merge_scopes }}" -# If true, all the VRE associated to the listed VOs are authorized -SMARTGEARS_VO_AUTH={{ smartgears_authorized_on_all_scopes }} - -CONTAINER_XML_FILE={{ smartgears_install_path }}/container.xml - -TOKEN= -RETVAL= -USE_SAVED_STATE= -CREATE_CONTAINER_XML_RES=0 - -####################### - -check_merge_scopes_behaviour() { - # 0: True, 1: False - USE_SAVED_STATE=0 - if [ $SMARTGEARS_MERGE_SCOPES == 'True' ] ; then - USE_SAVED_STATE=0 - logger "$LOG_PREFIX check_merge_scopes_behaviour: smartgears_merge_scopes set to True by the caller." - elif [ $SMARTGEARS_MERGE_SCOPES == 'False' ] ; then - USE_SAVED_STATE=1 - logger "$LOG_PREFIX check_merge_scopes_behaviour: smartgears_merge_scopes set to False by the caller." - else - logger "$LOG_PREFIX check_merge_scopes_behaviour: smartgears_merge_scopes set to a not correct value. Assuming True." - fi -} - -check_smartgears_state_presence() { - if [ ! -f $SMARTGEARS_RUNNING_STATE_FILE ] ; then - USE_SAVED_STATE=1 - logger "$LOG_PREFIX check_smartgears_state_presence: No state file, it was removed or it is a first installation. We need a token to proceed successfully from now on." - else - logger "$LOG_PREFIX check_smartgears_state_presence: There is a local state." - fi -} - -decide_how_to_proceed() { - if [ -z $TOKEN ] ; then - if [ ! -f $SMARTGEARS_RUNNING_STATE_FILE ] ; then - logger "$LOG_PREFIX decide_how_to_proceed: No token no local state. Maybe a first installation. Aborting." - exit 1 - elif [ $USE_SAVED_STATE -eq 1 ] ; then - logger "$LOG_PREFIX decide_how_to_proceed: No token and we do not want to merge the local state. Doing nothing." - exit 0 - fi - else - logger "$LOG_PREFIX decide_how_to_proceed: Got a token. We are going to request tokens from the authorisation service." - fi -} - -load_the_scopes_list_from_file() { - if [ ! -z $TOKEN ] ; then - SCOPES_LIST="" - if [ -f $LOCAL_ETC/scopes.list ] ; then - . $LOCAL_ETC/scopes.list - logger "$LOG_PREFIX load_the_scopes_list_from_file: A token was provided." - else - logger "$LOG_PREFIX load_the_scopes_list_from_file: There is no scopes list file, this should never happen. Aborting." - exit 1 - fi - else - # If no token was provided, we cannot use the file with the list of provided scopes - logger "$LOG_PREFIX load_the_scopes_list_from_file: No token was provided, not loading the scopes list file." - fi -} - -get_scopes_from_auth() { - # We have a token and a list of scopes names. Get the scope tokens for them. - logger "$LOG_PREFIX get_scopes_from_auth: get_scopes_from_auth. We have a token and a list of scopes names. Get the scope tokens for them." - for jar in $( ls -1 /home/gcube/tomcat/lib/ ) ; do - export CLASSPATH="/home/gcube/SmartGears/lib/${jar}:$CLASSPATH" - done - cd $LOCAL_LIB - {% if hostname is defined %} - java TokenGenerator {{ hostname }} $TOKEN $HTTP_PORT $SCOPES_FILE $SCOPES_LIST >/dev/null 2>&1 - {% else %} - java TokenGenerator {{ smartgears_hostname }} $TOKEN $HTTP_PORT $SCOPES_FILE $SCOPES_LIST >/dev/null 2>&1 - {% endif %} - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - logger "$LOG_PREFIX get_scopes_from_auth: We got the scope tokens." - else - logger "$LOG_PREFIX get_scopes_from_auth: Unable to obtain the scope tokens, aborting." - exit 1 - fi -} - -get_scopes_from_local_state() { - if [ ! -f $SMARTGEARS_RUNNING_STATE_FILE ] ; then - USE_SAVED_STATE=1 - logger "$LOG_PREFIX get_scopes_from_local_state: No state file, it was removed or it is a first installation. Skip the request for the local state, do not merge the local state." - return 0 - fi - # Get the scopes from the local state - cd $SMARTGEARS_SCRIPTS_DIR - . $GHN_ENV_FILE - ./clean-container-state -s $SMARTGEARS_SAVED_STATE_F - RETVAL=$? - if [ $RETVAL -ne 0 ] ; then - # We were not able to get the running state from the IS. Try to get new scope tokens - logger "$LOG_PREFIX get_scopes_from_local_state: We were not able to get the running state from the IS." - fi - logger "$LOG_PREFIX get_scopes_from_local_state: Got the scopes." -} - -get_scopes() { - if [ ! -z $TOKEN ] ; then - # We have a token, let's use it - load_the_scopes_list_from_file - get_scopes_from_auth - fi - # We try to get the scopes from the local state unconditionally, so that we always cleanup the state. - get_scopes_from_local_state -} - -assemble_the_container_xml_file() { - # Now that we have the tokens, we can assemble the container.xml file - logger "$LOG_PREFIX assemble_the_container_xml_file: Start assembling the container.xml file." - chmod 640 $CONTAINER_XML_FILE - if [ ! -z $TOKEN ] && [ $USE_SAVED_STATE -eq 0 ] ; then - CREATE_CONTAINER_XML=$( cat $CONTAINER_XML_HEAD $SCOPES_FILE $SMARTGEARS_SAVED_STATE_PATH $CONTAINER_XML_TAIL > $CONTAINER_XML_FILE ) - CREATE_CONTAINER_XML_RES=$? - logger "$LOG_PREFIX $CONTAINER_XML_FILE assemble_the_container_xml_file: Merge the scopes obtained from the authorisation service with the local state." - elif [ ! -z $TOKEN ] && [ $USE_SAVED_STATE -eq 1 ] ; then - CREATE_CONTAINER_XML=$( cat $CONTAINER_XML_HEAD $SCOPES_FILE $CONTAINER_XML_TAIL > $CONTAINER_XML_FILE ) - CREATE_CONTAINER_XML_RES=$? - logger "$LOG_PREFIX $CONTAINER_XML_FILE assemble_the_container_xml_file: Use the scopes obtained from the authorisation service." - elif [ -z $TOKEN ] && [ $USE_SAVED_STATE -eq 0 ] ; then - CREATE_CONTAINER_XML=$( cat $CONTAINER_XML_HEAD $SMARTGEARS_SAVED_STATE_PATH $CONTAINER_XML_TAIL > $CONTAINER_XML_FILE ) - CREATE_CONTAINER_XML_RES=$? - logger "$LOG_PREFIX $CONTAINER_XML_FILE assemble_the_container_xml_file: Use the scopes from the local state." - fi - if [ $CREATE_CONTAINER_XML_RES -ne 0 ] ; then - logger "$LOG_PREFIX assemble_the_container_xml_file: $CONTAINER_XML_FILE cannot be updated. Error is $CREATE_CONTAINER_XML" - exit $CREATE_CONTAINER_XML_RES - fi - chmod 440 $CONTAINER_XML_FILE - logger "$LOG_PREFIX $CONTAINER_XML_FILE assemble_the_container_xml_file: updated" -} - -############ -# -# Main -# -# check_token_presence -if [ $# -gt 0 ] ; then - # Ignore anything other than the first parameter - logger "$LOG_PREFIX check_token_presence: We have an authorization token." - TOKEN=$1 -else - logger "$LOG_PREFIX check_token_presence: # of arguments is $#. No token." -fi - -check_merge_scopes_behaviour -check_smartgears_state_presence -decide_how_to_proceed -get_scopes -assemble_the_container_xml_file - -exit 0 diff --git a/smartgears/smartgears/templates/logback.xml.j2 b/smartgears/smartgears/templates/logback.xml.j2 deleted file mode 100644 index e66cc745..00000000 --- a/smartgears/smartgears/templates/logback.xml.j2 +++ /dev/null @@ -1,161 +0,0 @@ - - - {{ smartgears_log_dir }}/ghn.log - true - - %date [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/ghn.%d{yyyy-MM-dd}.%i.log - {{ smartgears_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_dir }}/ghn.%d{yyyy-MM-dd}.log - {{ smartgears_log_max_history }} - -{% endif %} - - - - {{ smartgears_log_dir }}/accounting.log - true - - %date [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/accounting.%d{yyyy-MM-dd}.%i.log - {{ smartgears_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_dir }}/accounting.%d{yyyy-MM-dd}.log - {{ smartgears_log_max_history }} - -{% endif %} - - - - {{ smartgears_log_dir }}/access.log - true - - %date [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/access.%d{yyyy-MM-dd}.%i.log - {{ smartgears_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_dir }}/access.%d{yyyy-MM-dd}.log - {{ smartgears_log_max_history }} - -{% endif %} - - -{% if dataminer_app_install is defined and dataminer_app_install %} - - {{ smartgears_log_dir }}/analysis.log - true - - %date [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/analysis.%d{yyyy-MM-dd}.%i.log - {{ smartgears_dataanalysis_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_max_file_size }} - {{ smartgears_log_dir }}/analysis.%d{yyyy-MM-dd}.log - {{ smartgears_dataanalysis_log_max_history }} - -{% endif %} - - - - - - - - - - - {{ smartgears_log_dir }}/n52/n52.log - true - - %date [%thread] %-5level %logger{0}: %msg%n - -{% if smartgears_log_use_timesize_appender %} - - {{ smartgears_log_dir }}/n52/n52.%d{yyyy-MM-dd}.%i.log - {{ smartgears_dataanalysis_log_max_history }} - {{ smartgears_log_max_file_size }} - {{ smartgears_log_total_file_cap }} - -{% else %} - - {{ smartgears_log_max_file_size }} - {{ smartgears_log_dir }}/n52/n52.%d{yyyy-MM-dd}.log - {{ smartgears_dataanalysis_log_max_history }} - -{% endif %} - - - - - -{% endif %} - -{% if smartgears_appender_list is defined %} -{% for obj in smartgears_appender_list %} - - /home/gcube/tomcat/logs/{{ obj.appender_file_name }}.log - true - - %date [%thread] %-5level %logger{0}: %msg%n - - - /home/gcube/tomcat/logs/{{ obj.appender_file_name | default('custom') }}.%d{yyyy-MM-dd}.%i.log - {{ obj.appender_maxHistory | default('30') }} - {{ obj.appender_maxFileSize | default('10MB') }} - {{ obj.appender_totalSizeCap | default('2GB') }} - - - - - -{% endfor %} -{% endif %} - - - - - - - - - - - - - - - - - - - - diff --git a/smartgears/smartgears/templates/scopes.list.j2 b/smartgears/smartgears/templates/scopes.list.j2 deleted file mode 100644 index 7ed4e0d7..00000000 --- a/smartgears/smartgears/templates/scopes.list.j2 +++ /dev/null @@ -1 +0,0 @@ -SCOPES_LIST="{% for scope in smartgears_scopes %}{{ scope }} {% endfor %}" diff --git a/smartgears/smartgears/templates/smartgears-nrpe.cfg.j2 b/smartgears/smartgears/templates/smartgears-nrpe.cfg.j2 deleted file mode 100644 index fd0df6b2..00000000 --- a/smartgears/smartgears/templates/smartgears-nrpe.cfg.j2 +++ /dev/null @@ -1,4 +0,0 @@ - -# Restart SmartGears (via handler) -command[global_restart_smartgears]=/usr/bin/sudo /etc/init.d/tomcat-instance-{{ smartgears_http_port }} restart - diff --git a/smartgears/smartgears/templates/tomcat-instance-default.j2 b/smartgears/smartgears/templates/tomcat-instance-default.j2 deleted file mode 100644 index a8fec22b..00000000 --- a/smartgears/smartgears/templates/tomcat-instance-default.j2 +++ /dev/null @@ -1,7 +0,0 @@ -export GHN_HOME={{ smartgears_user_home }}/SmartGears -export WEB_CONTAINER_HOME={{ smartgears_instance_path }} -{% if tomcat_additional_defaults is defined %} -{% for setting in tomcat_additional_defaults %} -{{ setting }} -{% endfor %} -{% endif %} diff --git a/smartgears/smartgears/vars/main.yml b/smartgears/smartgears/vars/main.yml deleted file mode 100644 index 1d950e1e..00000000 --- a/smartgears/smartgears/vars/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -smartgears_node: True -smartgears_install_generic_virthost: True -smartgears_instance_id: 1 - -tomcat_m_webapps_unpack: '{{ smartgears_tomcat_m_webapps_unpack }}' -tomcat_m_instances: '{{ smartgears_tomcat_m_instances }}' - -additional_data_directories: '{{ smartgears_additional_data_directories }}' - diff --git a/smartgears/smartgears_egi_image/tasks/main.yml b/smartgears/smartgears_egi_image/tasks/main.yml deleted file mode 100644 index ccac38f8..00000000 --- a/smartgears/smartgears_egi_image/tasks/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- import_tasks: setup-egi-image.yml - when: egi_image - diff --git a/smartgears/smartgears_egi_image/tasks/setup-egi-image.yml b/smartgears/smartgears_egi_image/tasks/setup-egi-image.yml deleted file mode 100644 index 1a7b19e4..00000000 --- a/smartgears/smartgears_egi_image/tasks/setup-egi-image.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Install the EGI image setup script - template: src=smartgears-setup.sh.j2 dest=/usr/local/bin/smartgears-setup owner=root group=root mode=0555 - tags: [ 'smartgears', 'tomcat', 'egi', 'egi_image' ] - -- name: Install the EGI gcube keys installer script - template: src=get-gcube-keys.sh.j2 dest=/usr/local/bin/get-gcube-keys owner=root group=root mode=0500 - tags: [ 'smartgears', 'tomcat', 'egi', 'egi_image' ] - diff --git a/smartgears/smartgears_egi_image/templates/get-gcube-keys.sh.j2 b/smartgears/smartgears_egi_image/templates/get-gcube-keys.sh.j2 deleted file mode 100644 index 5b10804b..00000000 --- a/smartgears/smartgears_egi_image/templates/get-gcube-keys.sh.j2 +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -SM_DIR={{ smartgears_install_path }} -SM_LIB_DIR=${SM_DIR}/lib -# The dataminer wants the gcube keys in a different directory too -SM_DATAMINER_PARALLEL_PROC={{ smartgears_user_home }}/tomcat/webapps/wps/ecocfg/PARALLEL_PROCESSING -LOG_DIR=/var/log/smartgears-gcubekeys-setup -LOG_FILE=${LOG_DIR}/gcubekeys-setup.log - -INFRA_NAME=$1 -rm -f $LOG_DIR/* -rmdir $LOG_DIR -mkdir -p $LOG_DIR - -if [ ! -d $SM_LIB_DIR ] ; then - echo "$0: The lib directory: $SM_LIB_DIR does not exist, aborting" >> $LOG_FILE - exit 1 -else - pushd $SM_LIB_DIR >/dev/null 2>&1 -fi - -if [ "$INFRA_NAME" == "gcube" ] ; then - echo "Downloading the keys for the $INFRA_NAME infra" >> $LOG_FILE - wget {{ gcube_dkey_1 }} --no-check-certificate -o $LOG_FILE.gcube -O gcube.gcubekey - wget {{ gcube_dkey_2 }} --no-check-certificate -o $LOG_FILE.devsec -O devsec.gcubekey - wget {{ gcube_dkey_3 }} --no-check-certificate -o $LOG_FILE.devNext -O devNext.gcubekey - wget {{ gcube_prekey_1 }} --no-check-certificate -o $LOG_FILE.preprod -O preprod.gcubekey -elif [ "$INFRA_NAME" == "d4science.research-infrastructures.eu" ] ; then - echo "Downloading the keys for the $INFRA_NAME infra" >> $LOG_FILE - wget {{ gcube_pkey_1 }} --no-check-certificate -o $LOG_FILE.d4science -O d4science.research-infrastructures.eu.gcubekey - wget {{ gcube_pkey_2 }} --no-check-certificate -o $LOG_FILE.FARM -O FARM.gcubekey - wget {{ gcube_pkey_3 }} --no-check-certificate -o $LOG_FILE.gCubeApps -O gCubeApps.gcubekey - wget {{ gcube_pkey_4 }} --no-check-certificate -o $LOG_FILE.D4Research -O D4Research.gcubekey - wget {{ gcube_pkey_3 }} --no-check-certificate -o $LOG_FILE.SoBigData -O SoBigData.gcubekey - wget {{ gcube_pkey_3 }} --no-check-certificate -o $LOG_FILE.OpenAIRE -O OpenAIRE.gcubekey - wget {{ gcube_pkey_3 }} --no-check-certificate -o $LOG_FILE.SmartArea -O SmartArea.gcubekey - chmod 400 $SM_LIB_DIR/*.gcubekey -else - echo "The Infra name is unknown, no keys downloaded" >> $LOG_FILE - exit 0 -fi -popd >/dev/null 2>&1 -chmod 400 $SM_LIB_DIR/*.gcubekey >> $LOG_FILE 2>&1 -chown gcube:root $SM_LIB_DIR/*.gcubekey >> $LOG_FILE 2>&1 -if [ -d $SM_DATAMINER_PARALLEL_PROC ] ; then - echo "This is a dataminer. Copy the keys inside the dataminer conf dir" >> $LOG_FILE 2>&1 - cp -a $SM_LIB_DIR/*.gcubekey $SM_DATAMINER_PARALLEL_PROC >> $LOG_FILE 2>&1 - chmod 400 $SM_DATAMINER_PARALLEL_PROC/*.gcubekey >> $LOG_FILE 2>&1 - chown gcube:root $SM_DATAMINER_PARALLEL_PROC/*.gcubekey >> $LOG_FILE 2>&1 -fi - -exit 0 - diff --git a/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2 b/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2 deleted file mode 100755 index 9c101143..00000000 --- a/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2 +++ /dev/null @@ -1,254 +0,0 @@ -#!/bin/bash - -SM_DIR={{ smartgears_install_path }} -SM_DOT_CONF_D={{ smartgears_user_home }}/.containerxml -SM_CONF_F=${SM_DOT_CONF_D}/1-container.xml -SM_CONF_TOKENS_F=${SM_DOT_CONF_D}/2-container.xml -SM_CONF_TAIL_F=${SM_DOT_CONF_D}/3-container.xml -SM_CONF_SCOPES_F=/usr/local/etc/scopes.list -SM_CONF_DEST_F=${SM_DIR}/container.xml -SM_LIB_DIR=${SM_DIR}/lib -SM_STATE_DIR=${SM_DIR}/state/ -GET_KEYS_SCRIPT=/usr/local/bin/get-gcube-keys -GET_SCOPES_SCRIPT=/usr/local/bin/get-scopes -SVC=tomcat-instance-{{ smartgears_http_port }} -TOMCAT_DEFAULT=/etc/default/${SVC} -LOG_FILE=/var/log/smartgears-node-setup.log -HOSTS_FILE=/etc/hosts -FQDN_HOST= -PUB_FQDN_HOST= -PUBLIC_IP= -MAIN_IP= -AUTHORIZE_CHILDREN= -WORKING_REVERSE_RESOLUTION=0 -RETVAL=0 -CLOUD_INSTANCE_DIR=/var/lib/cloud/instance -MEM=$( free -m | egrep ^Mem | awk '{ print $2 }' ) -JAVA_MAX_HEAP=$( expr $MEM - 2048 ) - -# WPS configuration data -WPS_CONFIG_FIXER=/usr/local/bin/wps-config-fixer - -# Init some variables that should be passed -if [ -z "${SMARTGEARS_SCOPES}" ] ; then - SMARTGEARS_SCOPES= -fi -if [ -z "${HOST}" ] ; then - HOST= -fi - -{% raw %} -> $LOG_FILE -function setup_hostname() { - echo "-- setup_hostname" >> $LOG_FILE - if [ -z "${HOST}" ] ; then - echo "No hostname was passed from the outside. Trying to find it out by ourselves" >> $LOG_FILE - FQDN_HOST=$( /bin/hostname -f ) - if [ -z "${FQDN_HOST}" ] ; then - echo "The machine has no FQDN. Revert to plain hostname if available" >> $LOG_FILE - HOST=$( /bin/hostname ) - echo "Setting the plain hostname: $HOST" >> $LOG_FILE - else - HOST=$FQDN_HOST - fi - fi -} - -function find_public_ip() { - echo "-- find_public_ip" >> $LOG_FILE - # We don't know if we have been assigned a private or public IP address - PUBLIC_IP=$( wget http://ipecho.net/plain -qO - ) - MAIN_IP=$( ip addr show scope global dev eth0 | grep inet | awk '{ print $2 }' | cut -d "/" -f 1 ) - echo "Our main IP is ${MAIN_IP}" >> $LOG_FILE - if [ -z $PUBLIC_IP ] ; then - # We have some kind of problem - echo "We cannot obtain our public IP from outside. Using our main IP address as public IP" >> $LOG_FILE - PUBLIC_IP=$MAIN_IP - else - echo "Our public IP is ${PUBLIC_IP}" >> $LOG_FILE - fi - # Try to know our public FQDN - TMP_FQDN_HOST=$( host $PUBLIC_IP ) - RET_FQDN=$? - if [ $RET_FQDN -eq 0 ] ; then - PUB_FQDN_HOST=$( host $PUBLIC_IP | awk '{print $5}' | sed -e 's/\.$//g' ) - else - echo "No reverse resolution available. WPS will not work." >> $LOG_FILE - WORKING_REVERSE_RESOLUTION=1 - fi -} - -function modify_hosts_file() { - echo "-- modify_hosts_file" >> $LOG_FILE - # Set the hosts file with the new data. Set /etc/hostname too - if [ $WORKING_REVERSE_RESOLUTION -eq 0 ] ; then - grep -v $HOST $HOSTS_FILE > $HOSTS_FILE.tmp - if [ "${FQDN_HOST}" == "${HOST}" ] ; then - LOCAL_HOSTNAME=${HOST} - fi - SHORT_HOSTNAME=$( echo ${PUB_FQDN_HOST} | cut -d . -f 1 - ) - echo "${PUBLIC_IP} ${PUB_FQDN_HOST} ${SHORT_HOSTNAME} ${LOCAL_HOSTNAME}" >> $HOSTS_FILE.tmp - mv $HOSTS_FILE.tmp $HOSTS_FILE - chmod 644 $HOSTS_FILE - chown root:root $HOSTS_FILE - if [ ! -z ${SHORT_HOSTNAME} ] ; then - echo "${SHORT_HOSTNAME}" > /etc/hostname - fi - fi -} - -function smartgears_config_parameters_check() { - echo "-- smartgears_config_parameters_check" >> $LOG_FILE - if [ -z "${INFRA_NAME}" ] ; then - echo "The infrastructure name is void" >> $LOG_FILE - RETVAL=1 - fi - if [ -z "${COUNTRY}" ] ; then - echo "The country code is void, setting a default" >> $LOG_FILE - export COUNTRY="IT" - elif [ ${#COUNTRY} -ne 2 ] ; then - echo "The country code is wrong. It must be two characters long" >> $LOG_FILE - RETVAL=1 - fi - if [ $RETVAL -eq 1 ] ; then - echo "Exiting because of errors. The SmartExecutor will not start" >> $LOG_FILE - exit 1 - fi -} - -function populate_head_containerxml() { - echo "-- populate_head_containerxml" >> $LOG_FILE - # We use the public FQDN if there's one. Otherwise we use the public IP - if [ ! -z ${PUB_FQDN_HOST} ] ; then - sed -i -e "s#@SMARTGEARS_HOSTNAME@#${PUB_FQDN_HOST}#g" $SM_CONF_F - else - sed -i -e "s#@SMARTGEARS_HOSTNAME@#${PUBLIC_IP}#g" $SM_CONF_F - fi - sed -i -e "s#@SMARTGEARS_INFRASTRUCTURE_NAME@#${INFRA_NAME}#g" $SM_CONF_F - sed -i -e "s#@SMARTGEARS_VO_NAME@#${SCOPE}#g" $SM_CONF_F - sed -i -e "s#@SMARTGEARS_COUNTRY@#${COUNTRY}#g" $SM_CONF_F - sed -i -e "s#@SMARTGEARS_LOCATION@#${LOCATION}#g" $SM_CONF_F - sed -i -e "s#@SMARTGEARS_AUTHORIZE_CHILDREN@#${AUTHORIZE_CHILDREN}#g" $SM_CONF_F -} - -function fix_wps_configuration() { - echo "-- fix_wps_configuration" >> $LOG_FILE - if [ -f $WPS_CONFIG_FIXER ] ; then - echo "This is a dataminer node" >> $LOG_FILE - sed -i -e "s#@SMARTGEARS_HOSTNAME@#${PUB_FQDN_HOST}#g" $WPS_CONFIG_FIXER - # Run the command to fix the dataminer configuration - $WPS_CONFIG_FIXER - else - echo "This is not a dataminer node, doing nothing here" >> $LOG_FILE - fi -} - -{% endraw %} - -function set_scopes_list() { - echo "-- set_scopes_list" >> $LOG_FILE - if [ -z "${SMARTGEARS_SCOPES}" ] ; then - SMARTGEARS_SCOPES="" - echo "No scopes were defined" >> $LOG_FILE - else - echo "The scopes list is $SMARTGEARS_SCOPES" >> $LOG_FILE - fi - echo "SCOPES_LIST='${SMARTGEARS_SCOPES}'" > $SM_CONF_SCOPES_F -} - -function fix_get_scopes() { - echo "-- fix_get_scopes" >> $LOG_FILE - # We use the public FQDN if there's one. Otherwise we use the public IP - if [ ! -z ${PUB_FQDN_HOST} ] ; then - sed -i -e "s#@SMARTGEARS_HOSTNAME@#${PUB_FQDN_HOST}#g" $GET_SCOPES_SCRIPT - else - sed -i -e "s#@SMARTGEARS_HOSTNAME@#${PUBLIC_IP}#g" $GET_SCOPES_SCRIPT - fi -} - -function get_smartgears_scope_tokens() { - # The SMARTGEARS_TOKEN variable need to be set outside the contextualization script - echo "-- get_smartgears_scope_tokens" >> $LOG_FILE - if [ -z "${SMARTGEARS_TOKEN}" ] ; then - echo "No infrastructure token was passed, aborting" >> $LOG_FILE - echo "" > $SM_CONF_TOKENS_F - else - $GET_SCOPES_SCRIPT $( echo ${SMARTGEARS_TOKEN}) >> $LOG_FILE - fi -} - -function fix_containerxml_perms() { - chown -R gcube:gcube ${SM_DOT_CONF_D} - chmod 640 ${SM_DOT_CONF_D}/.* - chown gcube:gcube $SM_CONF_DEST_F - chmod 640 $SM_CONF_DEST_F -} - - -# function merge_container_xml() { -# echo "-- merge_container_xml: compose the file" >> $LOG_FILE -# cat $SM_CONF_F $SM_CONF_TOKENS_F $SM_CONF_TAIL_F > $SM_CONF_DEST_F -# chown gcube:gcube $SM_CONF_DEST_F -# chmod 640 $SM_CONF_DEST_F -# } - -function get_gcube_keys() { - echo "-- get_gcube_keys" >> $LOG_FILE - # Get and install the gcube security keys - if [ -x $GET_KEYS_SCRIPT ] ; then - echo "Getting the infrastructure keys" >> $LOG_FILE - $GET_KEYS_SCRIPT ${INFRA_NAME} >> $LOG_FILE - rm -f $GET_KEYS_SCRIPT - echo "Done" >> $LOG_FILE - else - echo "Not getting the infrastructure keys, the script is not available." >> $LOG_FILE - fi -} - -function set_java_heap() { - echo "-- set_java_heap" >> $LOG_FILE - if [ $JAVA_MAX_HEAP -lt 1024 ] ; then - JAVA_MAX_HEAP=1024 - fi - grep -v ^JAVA_HEAP $TOMCAT_DEFAULT > $TOMCAT_DEFAULT.tmp - echo "JAVA_HEAP='-Xms${JAVA_MAX_HEAP}m -Xmx${JAVA_MAX_HEAP}m'" > $TOMCAT_DEFAULT.heap - cat $TOMCAT_DEFAULT.heap $TOMCAT_DEFAULT.tmp > $TOMCAT_DEFAULT -} - -function cleanup_cloud_user_data() { - # Remove the token from the use provided data file - echo "-- cleanup_cloud_user_data" >> $LOG_FILE - grep -v SMARTGEARS_TOKEN $CLOUD_INSTANCE_DIR/user-data.txt > $CLOUD_INSTANCE_DIR/user-data.txt.tmp - mv $CLOUD_INSTANCE_DIR/user-data.txt.tmp $CLOUD_INSTANCE_DIR/user-data.txt - grep -v SMARTGEARS_TOKEN $CLOUD_INSTANCE_DIR/user-data.txt.i > $CLOUD_INSTANCE_DIR/user-data.txt.i.tmp - mv $CLOUD_INSTANCE_DIR/user-data.txt.i.tmp $CLOUD_INSTANCE_DIR/user-data.txt.i -} - -############################## -# -# Main -# - -/etc/init.d/${SVC} stop >> $LOG_FILE 2>&1 -rm -fr ${SM_STATE_DIR}/* -rm -f ${SM_DIR}/ghn.log - -setup_hostname -find_public_ip -modify_hosts_file -smartgears_config_parameters_check -set_scopes_list -populate_head_containerxml -fix_wps_configuration -fix_get_scopes -get_smartgears_scope_tokens -fix_containerxml_perms -get_gcube_keys -set_java_heap -cleanup_cloud_user_data - -/usr/sbin/update-rc.d ${SVC} enable >> $LOG_FILE 2>&1 -/etc/init.d/${SVC} start >> $LOG_FILE 2>&1 - -exit 0 - diff --git a/smartgears/social-networking-library-ws/defaults/main.yml b/smartgears/social-networking-library-ws/defaults/main.yml deleted file mode 100644 index 4a5c0c81..00000000 --- a/smartgears/social-networking-library-ws/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -social_networking_library_ws_install: False -social_networking_library_ws_version: latest -social_networking_library_ws_name: social-networking-library-ws -social_networking_library_ws_group_id: org.gcube.portal -social_networking_library_ws_extension: war -social_networking_library_ws_file: '{{ social_networking_library_ws_name }}-{{ social_networking_library_ws_version }}.{{ social_networking_library_ws_extension }}' - diff --git a/smartgears/social-networking-library-ws/tasks/main.yml b/smartgears/social-networking-library-ws/tasks/main.yml deleted file mode 100644 index 4775e6a0..00000000 --- a/smartgears/social-networking-library-ws/tasks/main.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- block: - - name: Remove the old social-networking-library-ws files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}.{{ social_networking_library_ws_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: not social_networking_library_ws_install - tags: [ 'social_networking_library_ws' ] - -- block: - - name: Get the social-networking-library-ws war - maven_artifact: artifact_id={{ social_networking_library_ws_name }} version={{ social_networking_library_ws_version | default(omit) }} group_id={{ social_networking_library_ws_group_id }} extension={{ social_networking_library_ws_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ social_networking_library_ws_file }} verify_checksum=always - register: social_networking_library_ws_download - - - name: Remove the old social-networking-library-ws files when upgrading - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}.{{ social_networking_library_ws_extension }}' - when: social_networking_library_ws_download is changed - notify: Restart smartgears - -# - name: Copy the social_networking_library_ws war into the tomcat webapps dir -# copy: src={{ smartgears_downloads_dir }}/{{ social_networking_library_ws_file }} dest={{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}.{{ social_networking_library_ws_extension }} remote_src=yes force=yes -# notify: Restart smartgears - - name: Create the socialnetworking working directory - file: path={{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Unarchive the social_networking_library_ws war into the tomcat webapps dir - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ social_networking_library_ws_file }} dest={{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }} creates='{{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}/WEB-INF/lib' - register: socialnetworking_updated - notify: Restart smartgears - - - name: Install the socialnetworking web.xml - template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}/WEB-INF/web.xml - notify: Restart smartgears - tags: [ 'social_networking_library_ws', 'socialnetworking_webxml' ] - - become: True - become_user: '{{ d4science_user }}' - when: social_networking_library_ws_install - tags: [ 'social_networking_library_ws' ] diff --git a/smartgears/social-networking-library-ws/templates/web.xml.j2 b/smartgears/social-networking-library-ws/templates/web.xml.j2 deleted file mode 100644 index 32f82b90..00000000 --- a/smartgears/social-networking-library-ws/templates/web.xml.j2 +++ /dev/null @@ -1,49 +0,0 @@ - - - - Restful Web Application - - jersey-servlet - org.glassfish.jersey.servlet.ServletContainer - - jersey.config.beanValidation.enableOutputValidationErrorEntity.server - true - - - jersey.config.server.provider.packages - - io.swagger.jaxrs.listing, - org.gcube.portal.social.networking - - - 1 - - - - SwaggerBootstrap - org.gcube.portal.social.networking.swagger.config.Bootstrap - 2 - - - - jersey-servlet - /rest/* - - - - The token of the user J.A.R.V.I.S. on the portal (root context) - NOTIFIER_TOKEN - {{ socialnetworking_notifier_token }} - - - - org.gcube.portal.social.networking.liferay.ws.ServletContextClass - - - - index.jsp - - diff --git a/smartgears/social_data_indexer_se_plugin/defaults/main.yml b/smartgears/social_data_indexer_se_plugin/defaults/main.yml deleted file mode 100644 index c6ada23f..00000000 --- a/smartgears/social_data_indexer_se_plugin/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -social_data_indexer_se_plugin_install: False -social_data_indexer_se_plugin_version: latest -social_data_indexer_se_plugin_group_id: org.gcube.socialnetworking -social_data_indexer_se_plugin_name: 'social-data-indexer-se-plugin' -social_data_indexer_se_plugin_artifact_id: '{{ social_data_indexer_se_plugin_name }}' -social_data_indexer_se_plugin_extension: jar -social_data_indexer_se_plugin_classifier: jar-with-dependencies -social_data_indexer_se_plugin_file: '{{ social_data_indexer_se_plugin_name }}-{{ social_data_indexer_se_plugin_version }}-jar-with-dependencies.{{ social_data_indexer_se_plugin_extension }}' diff --git a/smartgears/social_data_indexer_se_plugin/tasks/main.yml b/smartgears/social_data_indexer_se_plugin/tasks/main.yml deleted file mode 100644 index e369e0e4..00000000 --- a/smartgears/social_data_indexer_se_plugin/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- block: - - name: Remove the old social indexer plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ social_data_indexer_se_plugin_name }}-*-jar-with-dependencies.jar - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not social_data_indexer_se_plugin_install - tags: [ 'smartgears', 'social_data_indexer_se', 'tomcat' ] - -- block: - - name: Get the social indexer plugin and install it inside the smart executor - maven_artifact: artifact_id={{ social_data_indexer_se_plugin_name }} version={{ social_data_indexer_se_plugin_version | default('latest') }} group_id={{ social_data_indexer_se_plugin_group_id }} extension={{ social_data_indexer_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ social_data_indexer_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ social_data_indexer_se_plugin_file }} - register: social_indexer_download - - - name: Remove the old social indexer plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ social_data_indexer_se_plugin_name }}-*-jar-with-dependencies.jar - when: social_indexer_download is changed - - - name: Copy the social indexer plugin to its final destination - copy: src={{ smartgears_downloads_dir }}/{{ social_data_indexer_se_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ social_data_indexer_se_plugin_file }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: social_data_indexer_se_plugin_install - tags: [ 'smartgears', 'social_data_indexer_se', 'tomcat' ] - diff --git a/smartgears/spd_service/defaults/main.yml b/smartgears/spd_service/defaults/main.yml deleted file mode 100644 index 5eb63071..00000000 --- a/smartgears/spd_service/defaults/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -gcube_repository: gcube-staging -spd_service_install: False -spd_service_upgrade: False -spd_service_version: latest -smartgears_webapp_name: species-products-discovery -spd_service_name: '{{ smartgears_webapp_name }}' - -spd_group_id: org.gcube.data.spd -spd_extension: war -spd_service_file: '{{ spd_service_name }}-{{ spd_service_version }}.{{ spd_extension }}' -spd_service_repository_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}' diff --git a/smartgears/spd_service/tasks/main.yml b/smartgears/spd_service/tasks/main.yml deleted file mode 100644 index 1140daf6..00000000 --- a/smartgears/spd_service/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old spd files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ spd_service_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ spd_service_name }}.{{ spd_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not spd_service_install - tags: [ 'spd_service' ] - -- block: - - name: Get the spd-service - maven_artifact: artifact_id={{ spd_service_name }} version={{ spd_service_version | default('latest') }} group_id={{ spd_group_id }} extension={{ spd_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ spd_service_file }} verify_checksum=always - register: spd_service_download - - - name: Remove the old spd files - file: path={{ smartgears_instance_path }}/webapps/{{ spd_service_name }} state=absent - when: spd_service_download is changed - - - name: Copy the spd war into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ spd_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ spd_service_name }}.{{ spd_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: spd_service_install - tags: [ 'spd_service' ] - diff --git a/smartgears/storage_hub/defaults/main.yml b/smartgears/storage_hub/defaults/main.yml deleted file mode 100644 index 55e6a91a..00000000 --- a/smartgears/storage_hub/defaults/main.yml +++ /dev/null @@ -1,103 +0,0 @@ ---- -storage_hub_install: False -storage_hub_upgrade: False -storage_hub_version: latest -storage_hub_name: storagehub - -storage_hub_group_id: org.gcube.data.access -storage_hub_extension: war -storage_hub_file: '{{ storage_hub_name }}-{{ storage_hub_version }}.{{ storage_hub_extension }}' - -# storagehub.xml context mapping -storagehub_config_file_path: '{{ smartgears_instance_path }}/{{ jackrabbit_repository_config }}' -storagehub_rep_home_dir: '{{ smartgears_instance_path }}/jackrabbit/workspaces' - -storagehub_resolver_basepath: https://data.d4science.org/shub -admin_pwd: "{{ vault_admin_pass }}" - -#gcubeapp config -storage_hub_app_name: StorageHub -storage_hub_webapp_group: DataAccess -storage_hub_webapp_version: 1.0.3 - -# Standard jackrabbit configuration -# -jackrabbit_data_dir: /data/jackrabbit - -jackrabbit_config_files: - - bootstrap.properties - - repository.xml - -jackrabbit_rmi_enabled: 'true' -jackrabbit_rmi_host: 'localhost' -jackrabbit_rmi_port: 0 -jackrabbit_repository_config: 'jackrabbit/repository.xml' -jackrabbit_repository_name: 'jackrabbit.repository' -jackrabbit_jndi_enabled: 'true' - -jackrabbit_db_type: 'postgresql' -jackrabbit_db_driver: 'org.postgresql.Driver' -jackrabbit_db_host: 'localhost' - -jackrabbit_virt_fs_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_virt_fs_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_virt_fs_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_virt_fs_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_virt_fs_db_name: 'workspace-db' -jackrabbit_virt_fs_db_user: 'workspace-db-user' -#jackrabbit_virt_fs_db_password: '' -jackrabbit_virt_fs_db_url: 'jdbc:{{ jackrabbit_virt_fs_db_type }}://{{ jackrabbit_virt_fs_db_host }}/{{ jackrabbit_virt_fs_db_name }}' - -# By default the data store uses the same database of the virtual filesystem -jackrabbit_data_store_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_data_store_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_data_store_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_data_store_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_data_store_db_name: '{{ jackrabbit_virt_fs_db_name }}' -jackrabbit_data_store_db_user: '{{ jackrabbit_virt_fs_db_user }}' -jackrabbit_data_store_db_password: '{{ jackrabbit_virt_fs_db_password }}' -jackrabbit_data_store_db_url: 'jdbc:{{ jackrabbit_data_store_db_type }}://{{ jackrabbit_data_store_db_host }}/{{ jackrabbit_data_store_db_name }}' -jackrabbit_data_store_db_tableprefix: 'datastore_' - -jackrabbit_security_adminid: 'jr_admin' -#jackrabbit_security_admin_pwd: '' - -jackrabbit_ws_default_workspace: 'default' - -jackrabbit_ws_persistence_manager: 'org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager' -jackrabbit_ws_persistence_manager_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_ws_persistence_manager_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_ws_persistence_manager_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_ws_persistence_manager_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_ws_persistence_manager_db_name: '{{ jackrabbit_virt_fs_db_name }}' -jackrabbit_ws_persistence_manager_db_user: '{{ jackrabbit_virt_fs_db_user }}' -jackrabbit_ws_persistence_manager_db_password: '{{ jackrabbit_virt_fs_db_password }}' -jackrabbit_ws_persistence_manager_db_url: 'jdbc:{{ jackrabbit_ws_persistence_manager_db_type }}://{{ jackrabbit_ws_persistence_manager_db_host }}/{{ jackrabbit_ws_persistence_manager_db_name }}' -jackrabbit_ws_persistence_manager_db_tableprefix: 'pm_${wsp.name}_' - -jackrabbit_ver_persistence_manager: 'org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager' -jackrabbit_ver_persistence_manager_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_ver_persistence_manager_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_ver_persistence_manager_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_ver_persistence_manager_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_ver_persistence_manager_db_name: '{{ jackrabbit_virt_fs_db_name }}' -jackrabbit_ver_persistence_manager_db_user: '{{ jackrabbit_virt_fs_db_user }}' -jackrabbit_ver_persistence_manager_db_password: '{{ jackrabbit_virt_fs_db_password }}' -jackrabbit_ver_persistence_manager_db_url: 'jdbc:{{ jackrabbit_ver_persistence_manager_db_type }}://{{ jackrabbit_ver_persistence_manager_db_host }}/{{ jackrabbit_ver_persistence_manager_db_name }}' -jackrabbit_ver_persistence_manager_db_tableprefix: 'pm_version_' - -# Cluster configuration. Same db host by default, different DB -jackrabbit_cluster_db_host: '{{ jackrabbit_db_host }}' -jackrabbit_cluster_db_type: '{{ jackrabbit_db_type }}' -jackrabbit_cluster_db_schema: '{{ jackrabbit_db_type }}' -jackrabbit_cluster_db_driver: '{{ jackrabbit_db_driver }}' -jackrabbit_cluster_db_name: 'ws-db-cluster-journal' -jackrabbit_cluster_db_user: 'ws-db-journal-user' -# jackrabbit_cluster_db_password: '' -jackrabbit_cluster_db_url: 'jdbc:{{ jackrabbit_cluster_db_type }}://{{ jackrabbit_cluster_db_host }}/{{ jackrabbit_cluster_db_name }}' -jackrabbit_cluster_db_tableprefix: 'journal_' -jackrabbit_cluster_node_id: '{{ ansible_fqdn }}' -# Set it to true if we want to clean the journal daily -jackrabbit_cluster_janitor_enabled: 'false' - - diff --git a/smartgears/storage_hub/tasks/main.yml b/smartgears/storage_hub/tasks/main.yml deleted file mode 100644 index b8b95589..00000000 --- a/smartgears/storage_hub/tasks/main.yml +++ /dev/null @@ -1,70 +0,0 @@ ---- -- block: - - name: Remove the installed home library/ storagehub when we do not want it installed - file: dest={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ home_library_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ home_library_name }}.war' - - '{{ smartgears_instance_path }}/webapps/{{ storage_hub_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ storage_hub_name }}.war' - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: not storage_hub_install - tags: [ 'storage_hub' ] - -- block: - - maven_artifact: artifact_id={{ storage_hub_name }} version={{ storage_hub_version | default(omit) }} group_id={{ storage_hub_group_id }} extension={{ storage_hub_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ storage_hub_file }} verify_checksum=always - register: storage_hub_download - - - name: Remove the installed storage hub before upgrading - file: dest={{ smartgears_instance_path }}/webapps/{{ storage_hub_name }} state=absent - when: storage_hub_download is changed - notify: Restart smartgears - - - name: Get the StorageHub war - maven_artifact: artifact_id={{ storage_hub_name }} version={{ storage_hub_ver | default('latest') }} group_id={{ storage_hub_group_id }} extension={{ storage_hub_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ storage_hub_file }} - register: storage_hub_download - - - - name: Create the storage_hub webapp directory - file: dest={{ smartgears_instance_path }}/webapps/{{ storage_hub_name }} state=directory - when: storage_hub_download - - - name: Unarchive the storage_hub war file - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ storage_hub_file }} dest={{ smartgears_instance_path }}/webapps/{{ storage_hub_name }} - args: - creates: '{{ smartgears_instance_path }}/webapps/{{ storage_hub_name }}/WEB-INF/web.xml' - notify: Restart smartgears - - - name: Install the storage_hub web.xml template - template: src=storage-hub-web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ storage_hub_name }}/WEB-INF/web.xml mode=0440 - notify: Restart smartgears - - - name: Create the JackRabbit persistence directory - become_user: root - file: dest={{ jackrabbit_data_dir }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }} - - - name: Verify if the JackRabbit persistence directory is in the place where the service expects it - stat: path={{ smartgears_instance_path }}/jackrabbit - register: jackrabbit_data_path - - - name: Link the data dir to the place where jackrabbit expects it - file: src={{ jackrabbit_data_dir }} dest={{ smartgears_instance_path }}/jackrabbit state=link - when: not jackrabbit_data_path.stat.exists - - - name: Install the repository configuration files - template: src={{ item }}.j2 dest={{ jackrabbit_data_dir }}/{{ item }} - with_items: '{{ jackrabbit_config_files }}' - notify: Restart smartgears - - - name: Install the additional service context default file - template: src=storagehub.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/storagehub.xml mode=0664 - notify: Restart smartgears - - become: True - become_user: '{{ smartgears_user }}' - when: storage_hub_install - tags: [ 'storage_hub' ] - diff --git a/smartgears/storage_hub/templates/bootstrap.properties.j2 b/smartgears/storage_hub/templates/bootstrap.properties.j2 deleted file mode 100644 index 6dbe7b0a..00000000 --- a/smartgears/storage_hub/templates/bootstrap.properties.j2 +++ /dev/null @@ -1,11 +0,0 @@ -#bootstrap properties for the repository startup servlet. -#Fri Jul 21 05:19:29 CEST 2017 -java.naming.factory.initial=org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory -repository.home=jackrabbit -rmi.enabled={{ jackrabbit_rmi_enabled }} -repository.config={{ jackrabbit_repository_config }} -repository.name={{ jackrabbit_repository_name }} -rmi.host={{ jackrabbit_rmi_host }} -java.naming.provider.url=http\://www.apache.org/jackrabbit -jndi.enabled={{ jackrabbit_jndi_enabled }} -rmi.port={{ jackrabbit_rmi_port }} diff --git a/smartgears/storage_hub/templates/repository.xml.j2 b/smartgears/storage_hub/templates/repository.xml.j2 deleted file mode 100644 index 3621370e..00000000 --- a/smartgears/storage_hub/templates/repository.xml.j2 +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/smartgears/storage_hub/templates/storage-hub-web.xml.j2 b/smartgears/storage_hub/templates/storage-hub-web.xml.j2 deleted file mode 100644 index 14c1c7f9..00000000 --- a/smartgears/storage_hub/templates/storage-hub-web.xml.j2 +++ /dev/null @@ -1,24 +0,0 @@ - - - admin-username - {{ jackrabbit_security_adminid }} - - - admin-pwd - {{ jackrabbit_security_admin_pwd }} - - - resolver-basepath - {{ storagehub_resolver_basepath }} - - - - - org.gcube.data.access.storagehub.StorageHub - - - - org.gcube.data.access.storagehub.StorageHub - /workspace/* - - diff --git a/smartgears/storage_hub/templates/storagehub.xml.j2 b/smartgears/storage_hub/templates/storagehub.xml.j2 deleted file mode 100644 index feae2f10..00000000 --- a/smartgears/storage_hub/templates/storagehub.xml.j2 +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/smartgears/tabular_data/defaults/main.yml b/smartgears/tabular_data/defaults/main.yml deleted file mode 100644 index 48bbf847..00000000 --- a/smartgears/tabular_data/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -gcube_repository: gcube-staging -tabular_data_install: False -tabular_data_upgrade: False -tabular_data_version: latest -smartgears_webapp_name: tabular-data-manager -tabular_data_name: '{{ smartgears_webapp_name }}' - -tabular_group_id: org.gcube.data.analysis.tabulardata -tabular_extension: war -tabular_data_file: '{{ tabular_data_name }}-{{ tabular_data_version }}.{{ tabular_extension }}' diff --git a/smartgears/tabular_data/tasks/main.yml b/smartgears/tabular_data/tasks/main.yml deleted file mode 100644 index 078cb1f4..00000000 --- a/smartgears/tabular_data/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old tabulardata files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ tabular_data_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ tabular_data_name }}.{{ tabular_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not tabular_data_install - tags: [ 'tabular_data' ] - -- block: - - name: Get the tabular-data-service - maven_artifact: artifact_id={{ tabular_data_name }} version={{ tabular_data_version | default('latest') }} group_id={{ tabular_group_id }} extension={{ tabular_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ tabular_data_file }} verify_checksum=always - register: tabular_data_download - - - name: Remove the old tabulardata files - file: path={{ smartgears_instance_path }}/webapps/{{ tabular_data_name }} state=absent - when: ( tabular_data_download | change ) - - - name: Copy the tabular data war into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ tabular_data_file }} dest={{ smartgears_instance_path }}/webapps/{{ tabular_data_name }}.{{ tabular_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: tabular_data_install - tags: [ 'tabular_data' ] - diff --git a/smartgears/transect/defaults/main.yml b/smartgears/transect/defaults/main.yml deleted file mode 100644 index bddefbdd..00000000 --- a/smartgears/transect/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -transect_install: False -transect_upgrade: False -transect_version: latest -transect_name: transect - -transect_group_id: org.gcube.portlets.user -transect_extension: war -transect_file: '{{ transect_name }}-{{ transect_version }}.{{ transect_extension }}' - diff --git a/smartgears/transect/tasks/main.yml b/smartgears/transect/tasks/main.yml deleted file mode 100644 index c7b767d6..00000000 --- a/smartgears/transect/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old transect files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ transect_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ transect_name }}.{{ transect_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not transect_install - tags: [ 'smartgears', 'transect', 'tomcat' ] - -- block: - - name: Get the transect-service - maven_artifact: artifact_id={{ transect_name }} version={{ transect_version | default('latest') }} group_id={{ transect_group_id }} extension={{ sdi_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ transect_file }} verify_checksum=always - register: transect_download - - - name: Remove the old transect files - file: path={{ smartgears_instance_path }}/webapps/{{ transect_name }} state=absent - when: transect_download is changed - - - name: Copy the transect service war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ transect_file }} dest={{ smartgears_instance_path }}/webapps/{{ transect_name }}.{{ transect_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: transect_install - tags: [ 'smartgears', 'transect', 'tomcat' ] - diff --git a/smartgears/twittermon_se_plugins/defaults/main.yml b/smartgears/twittermon_se_plugins/defaults/main.yml deleted file mode 100644 index c79e5375..00000000 --- a/smartgears/twittermon_se_plugins/defaults/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -twittermon_se_plugin_install: False -twittermon_se_plugin_upgrade: False -twittermon_twmoncron_se_plugin_ver: 0.0.1-SNAPSHOT -twittermon_twmoncron_se_plugin_name: TwMonCronPlugin-0.0.1-SNAPSHOT-jar-with-dependencies.jar -twittermon_twmoncron_se_plugin_url: 'http://data.d4science.org/TzZmTmhOakRTOEpXNWJBdXQ0YnRKbFJEcTdZN0RCNkZHbWJQNStIS0N6Yz0' -twittermon_twmoncrawler_se_plugin_ver: 0.0.1-SNAPSHOT -twittermon_twmoncrawler_se_plugin_name: TwMonCrawlerPlugin-0.0.1-SNAPSHOT-jar-with-dependencies.jar -twittermon_twmoncrawler_se_plugin_url: 'http://data.d4science.org/dW5HSG92U3NEYnBXNWJBdXQ0YnRKc25nem9PMUE0aGRHbWJQNStIS0N6Yz0' -twittermon_php_crawler_url: 'http://data.d4science.org/YTRZRUNoWnhkZTlXNWJBdXQ0YnRKbHFUcHlIOElabEdHbWJQNStIS0N6Yz0' -twittermon_php_crawler_file: php_twmon_crawler.zip - diff --git a/smartgears/twittermon_se_plugins/tasks/main.yml b/smartgears/twittermon_se_plugins/tasks/main.yml deleted file mode 100644 index b13594a9..00000000 --- a/smartgears/twittermon_se_plugins/tasks/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- block: - - name: Remove the old twittermon - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ item }} - with_items: - - '{{ twittermon_twmoncron_se_plugin_name }}' - - '{{ twittermon_twmoncrawler_se_plugin_name }}' - when: twittermon_se_plugin_upgrade - tags: [ 'smartgears', 'twittermon_se'] - - - name: Get the twittermon TwMonCron smart executor plugin - get_url: url={{ twittermon_twmoncron_se_plugin_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ twittermon_twmoncron_se_plugin_name }} - when: twittermon_se_plugin_install - notify: Restart smartgears - tags: [ 'smartgears', 'twittermon_se', 'tomcat' ] - - - name: Get the twittermon TwMonCrawler smart executor plugin - get_url: url={{ twittermon_twmoncrawler_se_plugin_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ twittermon_twmoncrawler_se_plugin_name }} - when: twittermon_se_plugin_install - notify: Restart smartgears - tags: [ 'smartgears', 'twittermon_se', 'tomcat' ] - - - name: Create the directories needed by twittermon - file: dest={{ item }} state=directory - with_items: - - '{{ smartgears_user_home }}/twittermon_utils' - - '{{ smartgears_user_home }}/twmon/scripts' - - '{{ smartgears_user_home }}/twmon/scripts/data' - - '{{ smartgears_user_home }}/twmon/scripts/include' - - - name: Get the twittermon php utilities - unarchive: remote_src=yes src={{ twittermon_php_crawler_url }} dest={{ smartgears_user_home }}/twittermon_utils - - - name: Move the php utilities in the correct place - shell: 'cp {{ smartgears_user_home }}/twittermon_utils/php/sbd_twmonitor_crawler.php {{ smartgears_user_home }}/twmon/scripts/sbd_twmonitor_crawler.php ; chmod 755 {{ smartgears_user_home }}/twmon/scripts/sbd_twmonitor_crawler.php ; cp -rp {{ smartgears_user_home }}/twittermon_utils/php/include/* {{ smartgears_user_home }}/twmon/scripts/include' - args: - creates: '{{ smartgears_user_home }}/twmon/scripts/sbd_twmonitor_crawler.php' - - become: True - become_user: '{{ smartgears_user }}' - when: twittermon_se_plugin_install - tags: [ 'smartgears', 'twittermon_se', 'tomcat' ] diff --git a/smartgears/uri_resolver/defaults/main.yml b/smartgears/uri_resolver/defaults/main.yml deleted file mode 100644 index 51b2953e..00000000 --- a/smartgears/uri_resolver/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -smartgears_uri_resolver_install: False -uri_resolver_ver: latest -uri_resolver_group_id: org.gcube.data.transfer -uri_resolver_name: uri-resolver -uri_resolver_extension: war -uri_resolver_file: '{{ uri_resolver_name }}-{{ uri_resolver_ver }}.{{ uri_resolver_extension }}' diff --git a/smartgears/uri_resolver/defaults/main.yml-e b/smartgears/uri_resolver/defaults/main.yml-e deleted file mode 100644 index 53351645..00000000 --- a/smartgears/uri_resolver/defaults/main.yml-e +++ /dev/null @@ -1,7 +0,0 @@ ---- -grsf_api_install: False -grsf_api_ver: latest -grsf_api_group_id: gr.forth.ics.isl -grsf_api_name: grsf-api -grsf_api_extension: war -grsf_api_file: '{{ grsf_api_name }}-{{ grsf_api_ver }}.{{ grsf_api_extension }}' diff --git a/smartgears/uri_resolver/tasks/main.yml b/smartgears/uri_resolver/tasks/main.yml deleted file mode 100644 index ebf7ac53..00000000 --- a/smartgears/uri_resolver/tasks/main.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- block: - - name: Remove the old uri-resolver files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}.{{ uri_resolver_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'uri_resolver' ] - when: not smartgears_uri_resolver_install - -- block: - - name: Get the uri-resolver war - maven_artifact: artifact_id={{ uri_resolver_name }} version={{ uri_resolver_version | default(omit) }} group_id={{ uri_resolver_group_id }} extension={{ uri_resolver_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ uri_resolver_file }} verify_checksum=always - register: uri_resolver_download - - - name: Remove the old uri-resolver files - file: path={{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }} state=absent - notify: Restart smartgears - when: uri_resolver_download is changed - - - name: Create the uri-resolver webapp directory - file: dest={{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }} state=directory - when: uri_resolver_download - - - name: Unarchive the uri_resolver war file - unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ uri_resolver_file }} dest={{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }} - args: - creates: '{{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}/WEB-INF/web.xml' - notify: Restart smartgears - - - name: Install the uri_resolver web.xml template - template: src=uri-resolver-web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}/WEB-INF/web.xml mode=0440 - notify: Restart smartgears - -# - name: Copy the uri-resolver war file into the webapps directory -# copy: src={{ smartgears_downloads_dir }}/{{ uri_resolver_file }} dest={{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}.{{ uri_resolver_extension }} remote_src=yes force=yes -# notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'uri_resolver' ] - when: smartgears_uri_resolver_install diff --git a/smartgears/uri_resolver/tasks/main.yml-e b/smartgears/uri_resolver/tasks/main.yml-e deleted file mode 100644 index 50829267..00000000 --- a/smartgears/uri_resolver/tasks/main.yml-e +++ /dev/null @@ -1,32 +0,0 @@ ---- -- block: - - name: Remove the old grsf-api files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}.{{ uri_resolver_extension }}' - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'uri_resolver', 'tomcat' ] - when: not uri_resolver_install - -- block: - - name: Get the grsf-api war - maven_artifact: artifact_id={{ uri_resolver_name }} version={{ uri_resolver_version | default(omit) }} group_id={{ uri_resolver_group_id }} extension={{ uri_resolver_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ uri_resolver_file }} - register: uri_resolver_download - - - name: Remove the old grsf-api files - file: path={{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }} state=absent - notify: Restart smartgears - when: uri_resolver_download is changed - - - name: Copy the GRSF api war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ uri_resolver_file }} dest={{ smartgears_instance_path }}/webapps/{{ uri_resolver_name }}.{{ uri_resolver_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'uri_resolver', 'tomcat' ] - when: uri_resolver_install diff --git a/smartgears/uri_resolver/templates/uri-resolver-web.xml.j2 b/smartgears/uri_resolver/templates/uri-resolver-web.xml.j2 deleted file mode 100644 index 7e5124e3..00000000 --- a/smartgears/uri_resolver/templates/uri-resolver-web.xml.j2 +++ /dev/null @@ -1,24 +0,0 @@ - - - - - root-app-token - {{ webxml_root_app_token }} - - - - root-scope - {{ webxml_root_scope }} - - - - org.gcube.datatransfer.resolver.UriResolver - - - - org.gcube.datatransfer.resolver.UriResolver - /* - - - - diff --git a/smartgears/ws_explorer_app/defaults/main.yml b/smartgears/ws_explorer_app/defaults/main.yml deleted file mode 100644 index 18023cc6..00000000 --- a/smartgears/ws_explorer_app/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -ws_explorer_install: False -ws_explorer_upgrade: False -ws_explorer_version: latest -ws_explorer_name: workspace-explorer-app - -ws_explorer_group_id: org.gcube.portlets.user -ws_explorer_extension: war -ws_explorer_file: '{{ ws_explorer_name }}-{{ ws_explorer_version }}.{{ ws_explorer_extension }}' - diff --git a/smartgears/ws_explorer_app/tasks/main.yml b/smartgears/ws_explorer_app/tasks/main.yml deleted file mode 100644 index 2d6f39f5..00000000 --- a/smartgears/ws_explorer_app/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- block: - - name: Remove the old files - file: path={{ item }} state=absent - with_items: - - '{{ smartgears_instance_path }}/webapps/{{ ws_explorer_name }}' - - '{{ smartgears_instance_path }}/webapps/{{ ws_explorer_name }}.{{ ws_explorer_extension }}' - - become: True - become_user: '{{ d4science_user }}' - when: not ws_explorer_install - tags: [ 'smartgears', 'ws_explorer', 'tomcat' ] - -- block: - - name: Get the ws explorer app - maven_artifact: artifact_id={{ ws_explorer_name }} version={{ ws_explorer_version | default('latest') }} group_id={{ ws_explorer_group_id }} extension={{ ws_explorer_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ ws_explorer_file }} verify_checksum=always - register: ws_explorer_download - - - name: Remove the old ws explorer - file: path={{ smartgears_instance_path }}/webapps/{{ ws_explorer_name }} state=absent - when: ws_explorer_download is changed - - - name: Copy the ws explorer war file into the webapps directory - copy: src={{ smartgears_downloads_dir }}/{{ ws_explorer_file }} dest={{ smartgears_instance_path }}/webapps/{{ ws_explorer_name }}.{{ ws_explorer_extension }} remote_src=yes force=yes - notify: Restart smartgears - - become: True - become_user: '{{ d4science_user }}' - when: ws_explorer_install - tags: [ 'smartgears', 'ws_explorer', 'tomcat' ] -