Skip to content

Commit

Permalink
bye-bye mapfishapp, so long and thanks for all the fish^Wmaps !
Browse files Browse the repository at this point in the history
  • Loading branch information
landryb committed Apr 6, 2023
1 parent 55f87bc commit 110874b
Show file tree
Hide file tree
Showing 20 changed files with 182 additions and 1,820 deletions.
9 changes: 0 additions & 9 deletions playbooks/georchestra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
gitversion: '{{ georchestra_versions.geoserver_datadir }}'
wms_srslist: [2154, 3857, 3942, 3943, 3944, 3945, 3946, 3947, 3948, 3949, 3950, 4171, 4258, 4326, 23030, 23031, 23032, 32630, 32631, 32632, 4171, 4271, 3758]
geowebcache_datadir: /srv/data/geowebcache/
extractor_datadir: /srv/data/extractor/
tomcat_keystore_pass: tomcatkstp
tomcat_basedir: /srv/tomcat
system_locale: en_US.UTF-8
Expand Down Expand Up @@ -153,10 +152,6 @@
pkg: georchestra-cas
tomcat: proxycas
enabled: True
extractorapp:
pkg: georchestra-extractorapp
tomcat: georchestra
enabled: True
geonetwork:
pkg: georchestra-geonetwork
tomcat: georchestra
Expand Down Expand Up @@ -190,10 +185,6 @@
pkg: georchestra-console
tomcat: georchestra
enabled: True
mapfishapp:
pkg: georchestra-mapfishapp
tomcat: georchestra
enabled: True
cadastrapp:
pkg: georchestra-cadastrapp
tomcat: georchestra
Expand Down
2 changes: 0 additions & 2 deletions roles/apache/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,11 @@
- { src: common, dest: _static }
- { src: common, dest: cas }
- { src: common, dest: analytics }
- { src: common, dest: extractorapp }
- { src: common, dest: geonetwork }
- { src: common, dest: geoserver }
- { src: common, dest: geowebcache }
- { src: common, dest: header }
- { src: common, dest: console }
- { src: common, dest: mapfishapp }
- { src: common, dest: mapstore }
- { src: common, dest: cadastrapp }
- { src: common, dest: mviewer }
Expand Down
1 change: 0 additions & 1 deletion roles/georchestra/tasks/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
- "{{ geonetwork.datadir.path }}"
- "{{ geoserver.datadir.path }}"
- "{{ geowebcache_datadir }}"
- "{{ extractor_datadir }}"
- "{{ georchestra.datadir.path }}"

- name: remove non-free and contrib for dependencies (bullseye)
Expand Down
19 changes: 0 additions & 19 deletions roles/georchestra/tasks/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,9 @@
- { file: datafeeder.properties, war: datafeeder, destdir: '' }
- { file: frontend-config.json, war: datafeeder, destdir: '' }
# - { file: geofence-geoserver.properties, war: geoserver, destdir: 'WEB-INF/classes' }
- { file: credentials.properties, war: mapfishapp, destdir: '' }
- { file: wms.servers.json, war: mapfishapp, destdir: '' }
- { file: wfs.servers.json, war: mapfishapp, destdir: '' }
- { file: wmts.servers.json, war: mapfishapp, destdir: '' }
- { file: config.yaml, war: mapfishapp, destdir: 'print' }
- { file: log4j.properties, war: mapfishapp, destdir: 'log4j' }
- { file: GEOR_custom.js, war: mapfishapp, destdir: 'js' }
- { file: localConfig.json, war: mapstore, destdir: 'configs' }
- { file: log4j.properties, war: mapstore, destdir: '' }
- { file: log4j.properties, war: extractorapp, destdir: 'log4j' }
- { file: log4j.properties, war: analytics, destdir: 'log4j' }
- { file: cadastrapp.properties, war: cadastrapp, destdir: '' }
- { file: logback.xml, war: cadastrapp, destdir: '' }
notify: restart all tomcats

- name: fix local geoserver url
tags: fix_gsurl
replace:
dest: "{{ georchestra.datadir.path }}/mapfishapp/{{ item }}.servers.json"
regexp: '"/geoserver'
replace: '"https://{{ georchestra.fqdn }}/geoserver'
with_items:
- wms
- wfs
- wmts
1 change: 0 additions & 1 deletion roles/georchestra/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
- "{{ geonetwork.datadir.path }}"
- "{{ geoserver.datadir.path }}"
- "{{ geowebcache_datadir }}"
- "{{ extractor_datadir }}"

- include: config.yml
tags: config
Expand Down
44 changes: 44 additions & 0 deletions roles/georchestra/templates/cadastrapp/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<logger name="org.georchestra.cadastrapp" level="INFO" />
<logger name="org.springframework" level="INFO" />

<!-- database -->
<logger name="org.hibernate.SQL" level="INFO" />
<logger name="org.hibernate.type" level="INFO" />
<logger name="org.springframework.jdbc.core.JdbcTemplate" level="INFO" />

<!-- services -->
<logger name="org.apache.cxf" level="WARN" />

<!-- pdf generation -->
<logger name="org.apache.xmlgraphics" level="WARN" />
<logger name="org.apache.fop" level="WARN" />

<!-- image generation -->
<logger name="org.geotools" level="WARN" />
<logger name="com.vividsolutions.jts" level="WARN" />

<!-- purge trace with quartz -->
<logger name="org.quartz.core.QuartzSchedulerThread" level="WARN" />

<!-- swagger info -->
<logger name="springfox.documentation" level="WARN" />

<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>/tmp/cadastrapp.log</file>
<encoder>
<pattern>%d [%thread] %-5level /%X{uri} - %X{sec-username:-nouser} - %X{sec-roles:-norole} - %X{sec-org:-noorg} -%logger{36} - %msg%n</pattern>
</encoder>
</appender>


<root level="INFO">
<appender-ref ref="FILE" />
</root>
</configuration>
10 changes: 2 additions & 8 deletions roles/georchestra/templates/default.properties.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
# Domain name of the geOrchestra instance
# URL must not include the trailing slash
# Once modified, adapt the following files accordingly:
# - mapfishapp/wfs.servers.json
# - mapfishapp/wms.servers.json
# - mapfishapp/wmts.servers.json
# - mapfishapp/credentials.properties
# - mapfishapp/print/config.yaml
# - mapfishapp/js/GEOR_custom.js
# - cas/cas.properties
# - ...
# or replace all the strings with `sed` (see README.md)
Expand All @@ -34,8 +28,8 @@ headerHeight=90
headerUrl=/header/

# Administrator email
# Default email address used to send and receive mails in atlas, console and
# extractorapp. See the corresponding properties files to override this email
# Default email address used to send and receive mails in atlas, console
# See the corresponding properties files to override this email
# address for specific needs.
administratorEmail={{ console_adminemail }}

Expand Down
28 changes: 0 additions & 28 deletions roles/georchestra/templates/extractorapp/log4j.properties.j2

This file was deleted.

134 changes: 134 additions & 0 deletions roles/georchestra/templates/geonetwork/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
server:
# address: localhost
port: 8480
forward-headers-strategy: FRAMEWORK
instance-id: ${spring.application.name}:${spring.application.instance_id:${spring.cloud.client.ip-address}}:${server.port}
servlet:
context-path: /ogc-api-records
encoding:
charset: UTF-8
force-response: true
management:
health.ldap.enabled: false
eureka:
client:
enabled: false
registerWithEureka: false
fetch-registry: false

spring:
profiles: standalone
rabbitmq.host: localhost
datasource:
driver-class-name: org.postgresql.Driver
url: jdbc:postgresql://localhost:5432/georchestra?currentSchema=geonetwork
username: geonetwork
password: geonetwork
jpa:
database-platform: org.hibernate.dialect.PostgreSQLDialect
jpa.generate-ddl: false
jpa.hibernate.ddl-auto: none
cloud:
config:
discovery:
enabled: false
enabled: false

gn:
baseurl: https://georchestra.dev.craig.fr/geonetwork
legacy.url: https://georchestra.dev.craig.fr/geonetwork
language:
default: fre
linkToLegacyGN4: true
site:
name: GeoNetwork
organization: opensource
index:
url: http://ids3.fluela:9200
records: gn-records-demo
username: "gn_user"
password: 8bVAgDPeNlNR9Y4H
search:
queryFilter: '+isTemplate:n AND -indexingError:true' # only show relevant records
trackTotalHits: true
formats:
- name: html
mimeType: text/html
responseProcessor: JsonUserAndSelectionAwareResponseProcessorImpl
operations:
- root
- collections
- collection
- items
- item
- name: xml
mimeType: application/xml
responseProcessor: XmlResponseProcessorImpl
operations:
- root
- collections
- collection
- items
- item
- name: json
mimeType: application/json
responseProcessor: JsonUserAndSelectionAwareResponseProcessorImpl
operations:
- root
- collections
- collection
- items
- item
- name : gn
mimeType : application/gn+xml
responseProcessor: XsltResponseProcessorImpl
- name: opensearch
mimeType: application/opensearchdescription+xml
operations:
- collection
- name : schema.org
mimeType : application/ld+json
responseProcessor: JsonLdResponseProcessorImpl
operations:
- items
- item
- name: dcat
mimeType: application/rdf+xml
responseProcessor: DcatCatalogResponseProcessorImpl
operations:
- items
- item
- name : dcat_turtle
mimeType : text/turtle
responseProcessor: JsonUserAndSelectionAwareResponseProcessorImpl
operations :
- item
- name : rss
mimeType : application/rss+xml
responseProcessor: RssResponseProcessorImpl
operations:
- items
- name : geojson
mimeType : application/geo+json
responseProcessor: GeoJsonResponseProcessorImpl
operations:
- items
- item
defaultMimeType: text/html

logging:
level:
# geonetwork roots
org.fao.geonet: DEBUG
org.fao.geonet.ogcapi: DEBUG
org.fao.geonet.searching: INFO
springfox:
documentation:
swaggerUi:
baseUrl: /openapi
openApi:
v3:
path: /openapi/v3/api-docs
swagger:
v2 :
path: /openapi/v2/api-docs
Loading

0 comments on commit 110874b

Please sign in to comment.