From 2e40021f4f2183635ab41c875c6540e5d04b0dc6 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <niko@krismer.de>
Date: Tue, 17 Dec 2013 17:42:49 +0100
Subject: [PATCH] configuring styles in geoserver using geoserver-shell added
scripts to deal with SRID 82344 added procedures/functions to handle calls to
dropTables some versions updates (postgresql jdbc) fixed permission problems
in postgresql database
---
build.gradle | 9 +-
etc/geoserver_config/styles/StyleEdge.xml | 8 --
.../styles/StyleEdgeExpiration.xml | 8 --
.../styles/StyleIsoCoverage.xml | 8 --
.../styles/StyleTransportationStations.xml | 8 --
.../styles/StyleVertexExpiration.xml | 8 --
etc/geoserver_config/styles/poi.png | Bin 5652 -> 0 bytes
etc/geoserver_config/workspaces/default.xml | 4 -
.../workspaces/iso/namespace.xml | 5 --
.../iso/pg/bz_iso_edg_g93nl5/featuretype.xml | 0
.../iso/pg/bz_iso_edg_g93nl5/layer.xml | 18 ----
.../workspaces/iso/pg/datastore.xml | 31 -------
.../workspaces/iso/styles/Buffer.sld | 28 ------
.../workspaces/iso/styles/Buffer.xml | 11 ---
.../iso/styles/Iso_Area_Polygon.sld | 29 ------
.../iso/styles/Iso_Area_Polygon.xml | 11 ---
.../iso/styles/STYLE_BLACK_BNODES.sld | 62 -------------
.../iso/styles/STYLE_BLACK_BNODES.xml | 11 ---
etc/geoserver_config/workspaces/iso/wcs.xml | 45 ----------
etc/geoserver_config/workspaces/iso/wfs.xml | 62 -------------
etc/geoserver_config/workspaces/iso/wms.xml | 46 ----------
.../workspaces/iso/workspace.xml | 4 -
etc/vagrant/bootstrap.sh | 26 +++++-
etc/vagrant/conf/geoserver_setup_styles.gs | 7 ++
.../conf/geoserver_style_edge.sld} | 0
.../conf/geoserver_style_edgeexpiration.sld} | 0
.../conf/geoserver_style_isocoverage.sld} | 0
.../conf/geoserver_style_stations.sld} | 83 +-----------------
.../geoserver_style_vertexexpiration.sld} | 0
etc/vagrant/conf/pg_procedures.sql | 25 ++++++
etc/vagrant/conf/srid_82344_insert.sql | 9 ++
etc/vagrant/conf/srid_82344_proj4.txt | 11 +++
etc/vagrant/conf/srid_82344_wkt.txt | 17 ++++
.../styles => vagrant/img}/bus.png | Bin
.../styles => vagrant/img}/car.png | Bin
.../styles => vagrant/img}/ferry.png | Bin
.../styles => vagrant/img}/tram.png | Bin
37 files changed, 101 insertions(+), 493 deletions(-)
delete mode 100644 etc/geoserver_config/styles/StyleEdge.xml
delete mode 100644 etc/geoserver_config/styles/StyleEdgeExpiration.xml
delete mode 100644 etc/geoserver_config/styles/StyleIsoCoverage.xml
delete mode 100644 etc/geoserver_config/styles/StyleTransportationStations.xml
delete mode 100644 etc/geoserver_config/styles/StyleVertexExpiration.xml
delete mode 100755 etc/geoserver_config/styles/poi.png
delete mode 100644 etc/geoserver_config/workspaces/default.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/namespace.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/featuretype.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/layer.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/pg/datastore.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/styles/Buffer.sld
delete mode 100644 etc/geoserver_config/workspaces/iso/styles/Buffer.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.sld
delete mode 100644 etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.sld
delete mode 100644 etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/wcs.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/wfs.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/wms.xml
delete mode 100644 etc/geoserver_config/workspaces/iso/workspace.xml
create mode 100644 etc/vagrant/conf/geoserver_setup_styles.gs
rename etc/{geoserver_config/styles/StyleEdge.sld => vagrant/conf/geoserver_style_edge.sld} (100%)
rename etc/{geoserver_config/styles/StyleEdgeExpiration.sld => vagrant/conf/geoserver_style_edgeexpiration.sld} (100%)
rename etc/{geoserver_config/styles/StyleIsoCoverage.sld => vagrant/conf/geoserver_style_isocoverage.sld} (100%)
rename etc/{geoserver_config/styles/StyleTransportationStations.sld => vagrant/conf/geoserver_style_stations.sld} (58%)
rename etc/{geoserver_config/styles/StyleVertexExpiration.sld => vagrant/conf/geoserver_style_vertexexpiration.sld} (100%)
create mode 100644 etc/vagrant/conf/pg_procedures.sql
create mode 100644 etc/vagrant/conf/srid_82344_insert.sql
create mode 100644 etc/vagrant/conf/srid_82344_proj4.txt
create mode 100644 etc/vagrant/conf/srid_82344_wkt.txt
rename etc/{geoserver_config/styles => vagrant/img}/bus.png (100%)
rename etc/{geoserver_config/styles => vagrant/img}/car.png (100%)
rename etc/{geoserver_config/styles => vagrant/img}/ferry.png (100%)
rename etc/{geoserver_config/styles => vagrant/img}/tram.png (100%)
diff --git a/build.gradle b/build.gradle
index 41b4755d..fbf8e2b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,8 @@ def getDate() {
ext {
defaultVersion = '0.3-SNAPSHOT'
isRelease = false
- vagrantDirString = System.properties['user.home'] + '/vagrantboxes/' + project.name.toLowerCase()
+// vagrantDirString = System.properties['user.home'] + '/vagrantboxes/' + project.name.toLowerCase()
+ vagrantDirString = '/media/data/VMs/vagrantboxes/' + project.name.toLowerCase()
vagrantDir = file("$vagrantDirString")
}
@@ -75,7 +76,9 @@ dependencies {
exclude(module: 'jetty-client')
}
compile group: 'org.json', name: 'json', version:'20131018'
- compile group: 'org.postgis', name: 'postgis-jdbc', version:'1.3.3'
+ compile(group: 'org.postgis', name: 'postgis-jdbc', version:'1.3+') {
+ exclude(module: 'postgis-stubs')
+ }
testCompile 'org.testng:testng:6+'
}
@@ -213,7 +216,7 @@ task vagrantPrepare << {
into vagrantDir
filter(FixCrLfFilter)
- filter(ReplaceTokens, tokens: [db_username: 'niko', db_password: 'secretPhdPassword#2013!'])
+ filter(ReplaceTokens, tokens: [db_username: 'niko', db_password: 'secretPhdPassword#2013!', shared_conf_dir: '/vagrant/conf'])
}
}
diff --git a/etc/geoserver_config/styles/StyleEdge.xml b/etc/geoserver_config/styles/StyleEdge.xml
deleted file mode 100644
index 67dda4d3..00000000
--- a/etc/geoserver_config/styles/StyleEdge.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7fe9</id>
- <name>StyleEdge</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleEdge.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleEdgeExpiration.xml b/etc/geoserver_config/styles/StyleEdgeExpiration.xml
deleted file mode 100644
index 73ba129c..00000000
--- a/etc/geoserver_config/styles/StyleEdgeExpiration.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl--2d6a5797:13f61cf1d96:-7a6e</id>
- <name>StyleEdgeExpiration</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleEdgeExpiration.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleIsoCoverage.xml b/etc/geoserver_config/styles/StyleIsoCoverage.xml
deleted file mode 100644
index 0bb335cd..00000000
--- a/etc/geoserver_config/styles/StyleIsoCoverage.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7fd3</id>
- <name>StyleIsoCoverage</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleIsoCoverage.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleTransportationStations.xml b/etc/geoserver_config/styles/StyleTransportationStations.xml
deleted file mode 100644
index 330ec7bf..00000000
--- a/etc/geoserver_config/styles/StyleTransportationStations.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff1</id>
- <name>StyleTransportationStations</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleTransportationStations.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleVertexExpiration.xml b/etc/geoserver_config/styles/StyleVertexExpiration.xml
deleted file mode 100644
index 36d4973f..00000000
--- a/etc/geoserver_config/styles/StyleVertexExpiration.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl--2d6a5797:13f61cf1d96:-7c37</id>
- <name>StyleVertexExpiration</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleVertexExpiration.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/poi.png b/etc/geoserver_config/styles/poi.png
deleted file mode 100755
index 45d734f33864b8a3d325907898f885e9c96aeb3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5652
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
diff --git a/etc/geoserver_config/workspaces/default.xml b/etc/geoserver_config/workspaces/default.xml
deleted file mode 100644
index 416c664e..00000000
--- a/etc/geoserver_config/workspaces/default.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- <name>iso</name>
-</workspace>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/namespace.xml b/etc/geoserver_config/workspaces/iso/namespace.xml
deleted file mode 100644
index 40d259c8..00000000
--- a/etc/geoserver_config/workspaces/iso/namespace.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<namespace>
- <id>NamespaceInfoImpl-62a194ec:13f1f1ad116:-7ffe</id>
- <prefix>iso</prefix>
- <uri>http://isochrones.inf.unibz.it</uri>
-</namespace>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/featuretype.xml b/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/featuretype.xml
deleted file mode 100644
index e69de29b..00000000
diff --git a/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/layer.xml b/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/layer.xml
deleted file mode 100644
index 78956555..00000000
--- a/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/layer.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<layer>
- <name>bz_iso_edg_g93nl5</name>
- <id>LayerInfoImpl--7847af3:13f322305ce:-46e2</id>
- <type>VECTOR</type>
- <defaultStyle>
- <id>StyleInfoImpl--570ae188:124761b8d78:-7fe3</id>
- </defaultStyle>
- <resource class="featureType">
- <id>FeatureTypeInfoImpl--7847af3:13f322305ce:-46e3</id>
- </resource>
- <enabled>true</enabled>
- <advertised>true</advertised>
- <queryable>true</queryable>
- <attribution>
- <logoWidth>0</logoWidth>
- <logoHeight>0</logoHeight>
- </attribution>
-</layer>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/pg/datastore.xml b/etc/geoserver_config/workspaces/iso/pg/datastore.xml
deleted file mode 100644
index ba3e2af6..00000000
--- a/etc/geoserver_config/workspaces/iso/pg/datastore.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<dataStore>
- <id>DataStoreInfoImpl--1301da3f:13f1f253a02:-8000</id>
- <name>pg</name>
- <type>PostGIS</type>
- <enabled>true</enabled>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <connectionParameters>
- <entry key="port">5432</entry>
- <entry key="Connection timeout">20</entry>
- <entry key="passwd">crypt1:fonaofqAc1GADe6UeQZXg18VRKYJHnx7</entry>
- <entry key="dbtype">postgis</entry>
- <entry key="host">localhost</entry>
- <entry key="validate connections">true</entry>
- <entry key="encode functions">false</entry>
- <entry key="max connections">10</entry>
- <entry key="database">isochrones</entry>
- <entry key="namespace">http://isochrones.inf.unibz.it</entry>
- <entry key="schema">public</entry>
- <entry key="Loose bbox">true</entry>
- <entry key="Expose primary keys">true</entry>
- <entry key="Max open prepared statements">50</entry>
- <entry key="fetch size">1000</entry>
- <entry key="preparedStatements">true</entry>
- <entry key="Estimated extends">true</entry>
- <entry key="user">postgres</entry>
- <entry key="min connections">1</entry>
- </connectionParameters>
- <__default>false</__default>
-</dataStore>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Buffer.sld b/etc/geoserver_config/workspaces/iso/styles/Buffer.sld
deleted file mode 100644
index 0fac51af..00000000
--- a/etc/geoserver_config/workspaces/iso/styles/Buffer.sld
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc"
- xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
- <NamedLayer>
- <Name>Default Polygon</Name>
- <UserStyle>
- <Title>Default polygon style</Title>
- <Abstract>A sample style that just draws out a solid gray interior with a black 1px outline</Abstract>
- <FeatureTypeStyle>
- <Rule>
- <Title>Polygon</Title>
- <PolygonSymbolizer>
- <Fill>
- <CssParameter name="fill">#AAAAAA</CssParameter>
- <CssParameter name="fill-opacity">0.3</CssParameter>
- </Fill>
- <!--Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">1</CssParameter>
- <CssParameter name="fill-opacity">0.4</CssParameter>
- </Stroke-->
- </PolygonSymbolizer>
- </Rule>
- </FeatureTypeStyle>
- </UserStyle>
- </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Buffer.xml b/etc/geoserver_config/workspaces/iso/styles/Buffer.xml
deleted file mode 100644
index a6fc4ee3..00000000
--- a/etc/geoserver_config/workspaces/iso/styles/Buffer.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff2</id>
- <name>Buffer</name>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>Buffer.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.sld b/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.sld
deleted file mode 100644
index 04ab21d0..00000000
--- a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.sld
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc"
- xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
- <NamedLayer>
- <Name>Default Polygon</Name>
- <UserStyle>
- <Title>Default polygon style</Title>
- <Abstract>A sample style that just draws out a solid gray interior with a black 1px outline</Abstract>
- <FeatureTypeStyle>
- <Rule>
- <Title>Polygon</Title>
- <PolygonSymbolizer>
- <Fill>
- <CssParameter name="fill">#AAAAAA</CssParameter>
- <CssParameter name="fill-opacity">0.5</CssParameter>
- </Fill>
- <Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">1</CssParameter>
- <CssParameter name="stroke-opacity">0.9</CssParameter>
- </Stroke>
- </PolygonSymbolizer>
- </Rule>
-
- </FeatureTypeStyle>
- </UserStyle>
- </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.xml b/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.xml
deleted file mode 100644
index 98c0495b..00000000
--- a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff3</id>
- <name>Iso_Area_Polygon</name>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>Iso_Area_Polygon.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.sld b/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.sld
deleted file mode 100644
index 0da04803..00000000
--- a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.sld
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
- xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <NamedLayer>
- <Name>STYLE_BLACK_BNODES</Name>
- <UserStyle>
- <Name>STYLE_BNODES</Name>
- <Title>Reached bus nodes</Title>
- <Abstract>Generated by GeoServer</Abstract>
- <FeatureTypeStyle>
- <Rule>
- <Name>Large Zoom</Name>
- <Title>Bus Node</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>10000</MinScaleDenominator>
- <MaxScaleDenominator>150000</MaxScaleDenominator>
- <PointSymbolizer>
- <Graphic>
- <Mark>
- <WellKnownName>square</WellKnownName>
- <Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">1</CssParameter>
- </Stroke>
- <Fill>
- <CssParameter name="fill">#FFFFFF</CssParameter>
- <CssParameter name="fill-opacity">0.9</CssParameter>
- </Fill>
- </Mark>
- <Opacity>0.9</Opacity>
- <Size>4</Size>
- </Graphic>
- </PointSymbolizer>
- </Rule>
- <Rule>
- <Name>Small Zoom</Name>
- <Title>Bus Node</Title>
- <Abstract>Abstract</Abstract>
- <MaxScaleDenominator>10000</MaxScaleDenominator>
- <PointSymbolizer>
- <Graphic>
- <Mark>
- <WellKnownName>square</WellKnownName>
- <Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">2</CssParameter>
- </Stroke>
- <Fill>
- <CssParameter name="fill">#FFFFFF</CssParameter>
- <CssParameter name="fill-opacity">0.9</CssParameter>
- </Fill>
- </Mark>
- <Opacity>0.9</Opacity>
- <Size>12</Size>
- </Graphic>
- </PointSymbolizer>
- </Rule>
- </FeatureTypeStyle>
- </UserStyle>
- </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.xml b/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.xml
deleted file mode 100644
index 0f8f3e23..00000000
--- a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff4</id>
- <name>STYLE_BLACK_BNODES</name>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>STYLE_BLACK_BNODES.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/wcs.xml b/etc/geoserver_config/workspaces/iso/wcs.xml
deleted file mode 100644
index bd997301..00000000
--- a/etc/geoserver_config/workspaces/iso/wcs.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<wcs>
- <id>WCSInfoImpl--7847af3:13f322305ce:-4ac9</id>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <enabled>true</enabled>
- <name>WCS</name>
- <title>Web Coverage Service</title>
- <maintainer>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311</maintainer>
- <abstrct>This server implements the WCS specification 1.0 and 1.1.1, it's reference implementation of WCS 1.1.1. All layers published by this service are available on WMS also.
- </abstrct>
- <accessConstraints>NONE</accessConstraints>
- <fees>NONE</fees>
- <versions>
- <org.geotools.util.Version>
- <version>1.0.0</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>1.1.1</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>2.0.1</version>
- </org.geotools.util.Version>
- </versions>
- <keywords>
- <string>WCS</string>
- <string>WMS</string>
- <string>GEOSERVER</string>
- </keywords>
- <metadataLink>
- <type>undef</type>
- <about>http://geoserver.sourceforge.net/html/index.php</about>
- <metadataType>other</metadataType>
- </metadataLink>
- <citeCompliant>false</citeCompliant>
- <onlineResource>http://geoserver.sourceforge.net/html/index.php</onlineResource>
- <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
- <verbose>false</verbose>
- <gmlPrefixing>false</gmlPrefixing>
- <latLon>false</latLon>
- <maxInputMemory>0</maxInputMemory>
- <maxOutputMemory>0</maxOutputMemory>
- <subsamplingEnabled>true</subsamplingEnabled>
- <overviewPolicy>IGNORE</overviewPolicy>
-</wcs>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/wfs.xml b/etc/geoserver_config/workspaces/iso/wfs.xml
deleted file mode 100644
index c0815b7b..00000000
--- a/etc/geoserver_config/workspaces/iso/wfs.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<wfs>
- <id>WFSInfoImpl--7847af3:13f322305ce:-4ac7</id>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <enabled>true</enabled>
- <name>WFS</name>
- <title>GeoServer Web Feature Service</title>
- <maintainer>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311</maintainer>
- <abstrct>This is the reference implementation of WFS 1.0.0 and WFS 1.1.0, supports all WFS operations including Transaction.</abstrct>
- <accessConstraints>NONE</accessConstraints>
- <fees>NONE</fees>
- <versions>
- <org.geotools.util.Version>
- <version>1.0.0</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>1.1.0</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>2.0.0</version>
- </org.geotools.util.Version>
- </versions>
- <keywords>
- <string>WFS</string>
- <string>WMS</string>
- <string>GEOSERVER</string>
- </keywords>
- <metadataLink/>
- <citeCompliant>false</citeCompliant>
- <onlineResource>http://geoserver.sourceforge.net/html/index.php</onlineResource>
- <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
- <verbose>false</verbose>
- <gml>
- <entry>
- <version>V_10</version>
- <gml>
- <srsNameStyle>XML</srsNameStyle>
- <overrideGMLAttributes>true</overrideGMLAttributes>
- </gml>
- </entry>
- <entry>
- <version>V_20</version>
- <gml>
- <srsNameStyle>URN2</srsNameStyle>
- <overrideGMLAttributes>false</overrideGMLAttributes>
- </gml>
- </entry>
- <entry>
- <version>V_11</version>
- <gml>
- <srsNameStyle>URN</srsNameStyle>
- <overrideGMLAttributes>false</overrideGMLAttributes>
- </gml>
- </entry>
- </gml>
- <serviceLevel>COMPLETE</serviceLevel>
- <maxFeatures>1000000</maxFeatures>
- <featureBounding>false</featureBounding>
- <canonicalSchemaLocation>false</canonicalSchemaLocation>
- <encodeFeatureMember>false</encodeFeatureMember>
-</wfs>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/wms.xml b/etc/geoserver_config/workspaces/iso/wms.xml
deleted file mode 100644
index 3ec8b3c5..00000000
--- a/etc/geoserver_config/workspaces/iso/wms.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<wms>
- <id>WMSInfoImpl--7847af3:13f322305ce:-4ac8</id>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <enabled>true</enabled>
- <name>WMS</name>
- <title>GeoServer Web Map Service</title>
- <maintainer>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311</maintainer>
- <abstrct>A compliant implementation of WMS plus most of the SLD extension (dynamic styling). Can also generate PDF, SVG, KML, GeoRSS</abstrct>
- <accessConstraints>NONE</accessConstraints>
- <fees>NONE</fees>
- <versions>
- <org.geotools.util.Version>
- <version>1.1.1</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>1.3.0</version>
- </org.geotools.util.Version>
- </versions>
- <keywords>
- <string>WFS</string>
- <string>WMS</string>
- <string>GEOSERVER</string>
- </keywords>
- <metadataLink/>
- <citeCompliant>false</citeCompliant>
- <onlineResource>http://geoserver.sourceforge.net/html/index.php</onlineResource>
- <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
- <verbose>false</verbose>
- <metadata>
- <entry key="svgAntiAlias">true</entry>
- <entry key="svgRenderer">Batik</entry>
- </metadata>
- <bboxForEachCRS>false</bboxForEachCRS>
- <watermark class="org.geoserver.wms.WatermarkInfoImpl">
- <enabled>false</enabled>
- <position>BOT_RIGHT</position>
- <transparency>0</transparency>
- </watermark>
- <interpolation>Nearest</interpolation>
- <maxBuffer>25</maxBuffer>
- <maxRequestMemory>65536</maxRequestMemory>
- <maxRenderingTime>60</maxRenderingTime>
- <maxRenderingErrors>1000</maxRenderingErrors>
-</wms>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/workspace.xml b/etc/geoserver_config/workspaces/iso/workspace.xml
deleted file mode 100644
index 416c664e..00000000
--- a/etc/geoserver_config/workspaces/iso/workspace.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- <name>iso</name>
-</workspace>
\ No newline at end of file
diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 46ca5cf7..172a3d30 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -40,6 +40,7 @@ CACHE_DIR_REMOTE=http://www.krismer.de/files/PhD
DEPLOY_DIR=/opt
DOWNLOAD_DIR=$CACHE_DIR_LOCAL/wget
SHARED_CONF_DIR=/vagrant/conf
+SHARED_IMG_DIR=/vagrant/img
CMAKE_VERSION=2.8.12.1
CMAKE_VERSION_MAIN=v2.8
@@ -172,7 +173,13 @@ fn_import_data()
cp $DOWNLOAD_DIR/$SCHEDULE_FILE $DEPLOY_DIR/$SCHEDULE_FILE > /dev/null 2>&1
echo " - importing schedule into postgis database"
- gunzip -c $DEPLOY_DIR/$SCHEDULE_FILE | sudo -u postgres psql $PG_DB_NAME >> $WORKING_DIR/import_schedule.log 2>&1
+ gunzip -c $DEPLOY_DIR/$SCHEDULE_FILE | PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost $PG_DB_NAME >> $WORKING_DIR/import_schedule.log 2>&1
+
+ echo " - fixing schedule permissions"
+ tables=`PGPASSWORD=$PG_DB_PASSWORD psql -qAt -U $PG_DB_USER -h localhost -c "SELECT tablename FROM pg_tables WHERE schemaname = 'public' AND tableowner = 'postgres';" $PG_DB_NAME`
+ for tbl in $tables ; do
+ PGPASSWORD=$PG_DB_PASSWORD psql -qAt -U $PG_DB_USER -h localhost -c "ALTER TABLE $tbl OWNER TO $PG_DB_USER" $PG_DB_NAME;
+ done
fi
fi
@@ -181,7 +188,7 @@ fn_import_data()
$DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DEPLOY_DIR/$OSM_FILE_FILTERED" -conf "$OSM2PGROUTING_MAPPING_CONF" -dbname $PG_DB_NAME -user $PG_DB_USER -passwd $PG_DB_PASSWORD -clean -prefixtables $TABLE_PREFIX >> import_osm2pgrouting.log 2>&1
echo " - creating pgRouting topology"
- sudo -u postgres psql -d $PG_DB_NAME -c "SELECT pgr_createTopology('${TABLE_PREFIX}_ways', $TOPOLOGY_TOLERANCE, 'the_geom', 'gid');" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -c "SELECT pgr_createTopology('${TABLE_PREFIX}_ways', $TOPOLOGY_TOLERANCE, 'the_geom', 'gid');" >> $WORKING_DIR/setup_database.log 2>&1
fi
if $INSTALL_NEO4J_SPATIAL; then
@@ -537,14 +544,22 @@ if $INSTALL_POSTGRES; then
sudo -u postgres psql -d $PG_DB_NAME -c "CREATE USER $PG_DB_USER WITH PASSWORD '$PG_DB_PASSWORD';" >> $WORKING_DIR/setup_database.log 2>&1
sudo -u postgres psql -d $PG_DB_NAME -c "ALTER DATABASE $PG_DB_NAME OWNER TO $PG_DB_USER;" >> $WORKING_DIR/setup_database.log 2>&1
sudo -u postgres psql -d $PG_DB_NAME -c "GRANT ALL PRIVILEGES ON DATABASE $PG_DB_NAME to $PG_DB_USER;" >> $WORKING_DIR/setup_database.log 2>&1
+ sudo -u postgres psql -d $PG_DB_NAME -c "ALTER SCHEMA public OWNER TO $PG_DB_USER;" >> $WORKING_DIR/setup_database.log 2>&1
+ sudo -u postgres psql -d $PG_DB_NAME -c "ALTER ROLE $PG_DB_USER SUPERUSER;" >> $WORKING_DIR/setup_database.log 2>&1
fi
if $INSTALL_POSTGIS; then
- sudo -u postgres psql -d $PG_DB_NAME -c "CREATE EXTENSION postgis;" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -c "CREATE EXTENSION postgis;" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -f $SHARED_CONF_DIR/pg_procedures.sql >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -f $SHARED_CONF_DIR/srid_82344_insert.sql >> $WORKING_DIR/setup_database.log 2>&1
fi
if $INSTALL_PGROUTING; then
- sudo -u postgres psql -d $PG_DB_NAME -c "CREATE EXTENSION pgRouting;" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -c "CREATE EXTENSION pgRouting;" >> $WORKING_DIR/setup_database.log 2>&1
+fi
+
+if $INSTALL_POSTGIS && $INSTALL_GEOSERVER; then
+ echo "82344=`grep ^[^//,^#] /vagrant/conf/srid_82344_wkt.txt | paste -sd "" | sed 's/ \+ / /g'`" >> $DEPLOY_DIR/geoserver/data/user_projections/epsg.properties
fi
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -564,6 +579,9 @@ if $IMPORT_OSMDATA || $IMPORT_OSMDATA_CACHED; then
echo "Configuring geoserver $GEOSERVER_VERSION using geoserver-shell $GEOSERVER_SHELL_VERSION"
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_ws.gs > setup_geoserver_workspace.log 2>&1
+ sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_styles.gs > setup_geoserver_styles.log 2>&1
+ cp $SHARED_IMG_DIR/* $DEPLOY_DIR/geoserver/data/styles >> setup_geoserver_styles.log 2>&1
+
if $INSTALL_NEO4J_SPATIAL; then
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ds.gs > setup_geoserver_neo4j.log 2>&1
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_bz.gs >> setup_geoserver_neo4j.log 2>&1
diff --git a/etc/vagrant/conf/geoserver_setup_styles.gs b/etc/vagrant/conf/geoserver_setup_styles.gs
new file mode 100644
index 00000000..6f7c828a
--- /dev/null
+++ b/etc/vagrant/conf/geoserver_setup_styles.gs
@@ -0,0 +1,7 @@
+geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
+
+style create --file @shared_conf_dir@/geoserver_style_edge.sld --name StyleEdge
+style create --file @shared_conf_dir@/geoserver_style_edgeexpiration.sld --name StyleEdgeExpiration
+style create --file @shared_conf_dir@/geoserver_style_isocoverage.sld --name StyleIsoCoverage
+style create --file @shared_conf_dir@/geoserver_style_stations.sld --name StyleTransportationStations
+style create --file @shared_conf_dir@/geoserver_style_vertexexpiration.sld --name StyleVertexExpiration
diff --git a/etc/geoserver_config/styles/StyleEdge.sld b/etc/vagrant/conf/geoserver_style_edge.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleEdge.sld
rename to etc/vagrant/conf/geoserver_style_edge.sld
diff --git a/etc/geoserver_config/styles/StyleEdgeExpiration.sld b/etc/vagrant/conf/geoserver_style_edgeexpiration.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleEdgeExpiration.sld
rename to etc/vagrant/conf/geoserver_style_edgeexpiration.sld
diff --git a/etc/geoserver_config/styles/StyleIsoCoverage.sld b/etc/vagrant/conf/geoserver_style_isocoverage.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleIsoCoverage.sld
rename to etc/vagrant/conf/geoserver_style_isocoverage.sld
diff --git a/etc/geoserver_config/styles/StyleTransportationStations.sld b/etc/vagrant/conf/geoserver_style_stations.sld
similarity index 58%
rename from etc/geoserver_config/styles/StyleTransportationStations.sld
rename to etc/vagrant/conf/geoserver_style_stations.sld
index b7557630..09a83bfa 100644
--- a/etc/geoserver_config/styles/StyleTransportationStations.sld
+++ b/etc/vagrant/conf/geoserver_style_stations.sld
@@ -20,7 +20,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="tram.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/tram.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -44,7 +44,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="railway.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/railway.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -69,7 +69,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="bus.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/bus.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -94,7 +94,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="ferry.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/ferry.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -109,81 +109,6 @@
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
- <Rule>
- <Name>Cablecar station</Name>
- <Title>Cablecar stop station</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>1000</MinScaleDenominator>
- <MaxScaleDenominator>50000</MaxScaleDenominator>
- <!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
- <PointSymbolizer>
- <Graphic>
- <ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="cablecar.png" />
- <Format>image/png</Format>
- </ExternalGraphic>
- <Size>
- <ogc:Literal>12</ogc:Literal>
- </Size>
- </Graphic>
- </PointSymbolizer>
- <ogc:Filter>
- <ogc:PropertyIsEqualTo>
- <ogc:PropertyName>T_TYPE</ogc:PropertyName>
- <ogc:Literal>5</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
- <Rule>
- <Name>Gondola station</Name>
- <Title>Gondola stop station</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>1000</MinScaleDenominator>
- <MaxScaleDenominator>50000</MaxScaleDenominator>
- <!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
- <PointSymbolizer>
- <Graphic>
- <ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="gondola.png" />
- <Format>image/png</Format>
- </ExternalGraphic>
- <Size>
- <ogc:Literal>12</ogc:Literal>
- </Size>
- </Graphic>
- </PointSymbolizer>
- <ogc:Filter>
- <ogc:PropertyIsEqualTo>
- <ogc:PropertyName>T_TYPE</ogc:PropertyName>
- <ogc:Literal>6</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
- <Rule>
- <Name>Funicular station</Name>
- <Title>Funicular stop station</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>1000</MinScaleDenominator>
- <MaxScaleDenominator>50000</MaxScaleDenominator>
- <!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
- <PointSymbolizer>
- <Graphic>
- <ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="funicular.png" />
- <Format>image/png</Format>
- </ExternalGraphic>
- <Size>
- <ogc:Literal>12</ogc:Literal>
- </Size>
- </Graphic>
- </PointSymbolizer>
- <ogc:Filter>
- <ogc:PropertyIsEqualTo>
- <ogc:PropertyName>T_TYPE</ogc:PropertyName>
- <ogc:Literal>7</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
</FeatureTypeStyle>
</UserStyle>
</NamedLayer>
diff --git a/etc/geoserver_config/styles/StyleVertexExpiration.sld b/etc/vagrant/conf/geoserver_style_vertexexpiration.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleVertexExpiration.sld
rename to etc/vagrant/conf/geoserver_style_vertexexpiration.sld
diff --git a/etc/vagrant/conf/pg_procedures.sql b/etc/vagrant/conf/pg_procedures.sql
new file mode 100644
index 00000000..814f0dbd
--- /dev/null
+++ b/etc/vagrant/conf/pg_procedures.sql
@@ -0,0 +1,25 @@
+CREATE OR REPLACE FUNCTION dropTables(IN _schema TEXT, IN _regexp TEXT)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+ row record;
+BEGIN
+ FOR row IN
+ SELECT
+ table_schema,
+ table_name
+ FROM
+ information_schema.tables
+ WHERE
+ table_type = 'BASE TABLE'
+ AND
+ table_schema = _schema
+ AND
+ table_name ILIKE (_regexp)
+ LOOP
+ EXECUTE 'DROP TABLE ' || quote_ident(row.table_schema) || '.' || quote_ident(row.table_name);
+ RAISE INFO 'Dropped table: %', quote_ident(row.table_schema) || '.' || quote_ident(row.table_name);
+ END LOOP;
+END;
+$$;
diff --git a/etc/vagrant/conf/srid_82344_insert.sql b/etc/vagrant/conf/srid_82344_insert.sql
new file mode 100644
index 00000000..57cd6078
--- /dev/null
+++ b/etc/vagrant/conf/srid_82344_insert.sql
@@ -0,0 +1,9 @@
+INSERT into spatial_ref_sys (
+ srid, auth_name, auth_srid, proj4text, srtext
+) values (
+ 82344,
+ 'epsg',
+ 4258,
+ '+title=ETRF_1989_UTM_Zone_32N +proj=utm +zone=32 +ellps=WGS84 +lat_0=0 +lon_0=21.45233333333333 +k=0.999600 +x_0=500000.0 +y_0=0 +pm=greenwich +units=m',
+ 'PROJCS["UTM Zone 32, Northern Hemisphere (WGS 84)", GEOGCS["GCS_ETRF_1989", DATUM["WGS 84", SPHEROID["WGS_1984", 6378137.0, 298.257223563, AUTHORITY["EPSG","7030"]], AUTHORITY["EPSG","62580"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree",0.0174532925199433] AUTHORITY["EPSG","4258"]], PROJECTION["Transverse_Mercator"], PARAMETER["false_easting", 500000.0], PARAMETER["false_northing", 0.0], PARAMETER["central_meridian", 9.0], PARAMETER["scale_factor", 0.9996], PARAMETER["latitude_of_origin", 0.0], UNIT["m",1.0], AUTHORITY["EPSG","82344"]]'
+);
\ No newline at end of file
diff --git a/etc/vagrant/conf/srid_82344_proj4.txt b/etc/vagrant/conf/srid_82344_proj4.txt
new file mode 100644
index 00000000..633936e4
--- /dev/null
+++ b/etc/vagrant/conf/srid_82344_proj4.txt
@@ -0,0 +1,11 @@
++title=ETRF_1989_UTM_Zone_32N
++proj=utm
++zone=32
++ellps=WGS84
++lat_0=0
++lon_0=21.45233333333333
++k=0.999600
++x_0=500000.0
++y_0=0
++pm=greenwich
++units=m
diff --git a/etc/vagrant/conf/srid_82344_wkt.txt b/etc/vagrant/conf/srid_82344_wkt.txt
new file mode 100644
index 00000000..17dd5499
--- /dev/null
+++ b/etc/vagrant/conf/srid_82344_wkt.txt
@@ -0,0 +1,17 @@
+// Taken from https://www.inf.unibz.it/dis/wiki/doku.php?id=data:proj (fixed epsg:42580 to epsg:4258)
+
+PROJCS[
+ "UTM Zone 32, Northern Hemisphere (WGS 84)",
+ GEOGCS [ "WGS 84",
+ DATUM ["WGS 84",
+ SPHEROID ["WGS 84", 6378137, 298.257223563]
+ ],
+ PRIMEM [ "Greenwich", 0.000000 ],
+ UNIT ["Decimal Degree", 0.01745329251994330]
+ ],
+ PROJECTION ["Transverse Mercator"],
+ PARAMETER ["Scale_Factor", 0.999600],
+ PARAMETER ["Central_Meridian", 9.000000],
+ PARAMETER ["False_Easting", 500000.000000],
+ UNIT ["Meter", 1.000000000000]
+]
diff --git a/etc/geoserver_config/styles/bus.png b/etc/vagrant/img/bus.png
similarity index 100%
rename from etc/geoserver_config/styles/bus.png
rename to etc/vagrant/img/bus.png
diff --git a/etc/geoserver_config/styles/car.png b/etc/vagrant/img/car.png
similarity index 100%
rename from etc/geoserver_config/styles/car.png
rename to etc/vagrant/img/car.png
diff --git a/etc/geoserver_config/styles/ferry.png b/etc/vagrant/img/ferry.png
similarity index 100%
rename from etc/geoserver_config/styles/ferry.png
rename to etc/vagrant/img/ferry.png
diff --git a/etc/geoserver_config/styles/tram.png b/etc/vagrant/img/tram.png
similarity index 100%
rename from etc/geoserver_config/styles/tram.png
rename to etc/vagrant/img/tram.png
--
GitLab