-
Notifications
You must be signed in to change notification settings - Fork 94
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
update documentation #2909
update documentation #2909
Conversation
We can use the unofficial adoptopenjdk packages instead.
* "systemd-ifies" the doc, no longer using /etc/init.d * the tomcat9-instance-create does not the full job and it still requires some operations to be made by hand. TODO: I wonder if a SSL connector on the tomcat9-proxycas is still needed and why. I expect it is due to some geoserver behaviours which could be worked around.
so that the doc to setup the ldap tree is coherent.
* tomcat * apache * short explanation on how to deploy generic wars Tests: the documentation has been followed in a debian buster vagrant VM.
@@ -115,6 +115,10 @@ AddType application/vnd.ogc.context+xml .wmc | |||
|
|||
ErrorDocument 502 /errors/50x.html | |||
ErrorDocument 503 /errors/50x.html | |||
|
|||
# redirects onto the viewer by default | |||
RewriteRule ^/$ https://%{SERVER_NAME}/mapfishapp/ [R=301,L] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
by default, I had a directory listing from apache2. If nothing handles the '/', apache2 will handle it, regardless of the SP configuration.
But for sure, if you hit the SP directly, it will suggest a redirection to the default target.
docs/setup/tomcat.md
Outdated
verify the list of keys in keystore: | ||
``` | ||
keytool -keystore /etc/tomcat9/keystore -list | ||
``` | ||
|
||
## geOrchestra datadir | ||
|
||
Since the 15.12 version, geOrchestra allows its main configuration settings to be done into a specific directory, the "georchestra Datadir". |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
More than "allows", it is now required.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you're right, at the begining of the geor datadir, it was not mandatory though.
docs/setup/tomcat.md
Outdated
|
||
Since the 15.12 version, geOrchestra allows its main configuration settings to be done into a specific directory, the "georchestra Datadir". | ||
|
||
By convention, we will consider that the path `/etc/georchestra` will be dedicated to this datadir. We can bootstrap a default datadir by |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/can/have to/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
strictly speaking, the datadir could be elsewhere (that is what we do for our customers), I'd prefer to stay less restrictive than "have to", maybe a future ("we will bootstrap") would be more appropriate.
docs/setup/tomcat.md
Outdated
|
||
In that same file, a few lines below : | ||
replace | ||
``` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
diff syntax ?
docs/setup/tomcat.md
Outdated
``` | ||
JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64 | ||
JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GC availability/relevance to be double checked
docs/setup/tomcat.md
Outdated
@@ -251,52 +334,24 @@ JAVA_OPTS="$JAVA_OPTS \ | |||
-Djava.util.prefs.userRoot=/tmp \ | |||
-Djava.util.prefs.systemRoot=/tmp" | |||
``` | |||
This allocates 2Gb of your server RAM to all geOrchestra webapps (except proxy, cas and geoserver). | |||
This allocates 2GB of your server RAM to all geOrchestra webapps (except proxy, cas and geoserver, which are located in other tomcat instances). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably insufficient nowadays ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would propose 6 by default.
docs/setup/tomcat.md
Outdated
@@ -305,7 +360,7 @@ JAVA_OPTS="$JAVA_OPTS \ | |||
-Dgeonetwork.jeeves.configuration.overrides.file=/etc/georchestra/geonetwork/config/config-overrides-georchestra.xml" | |||
``` | |||
|
|||
Note: You can also override every geonetwork sub-data-directories by modifying | |||
Note: You can also overide every geonetwork sub-data-directories by modifying |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
override
docs/setup/tomcat.md
Outdated
|
||
``` | ||
JAVA_OPTS="$JAVA_OPTS \ | ||
-DGEOSERVER_XSTREAM_WHITELIST=org.geoserver.geoserver.authentication.auth.GeoFenceAuthenticationProviderConfig \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not see this option in https://github.com/georchestra/georchestra/blob/master/geoserver/webapp/src/docker/Dockerfile
docs/setup/tomcat.md
Outdated
GeoWebCache can be used either as a standalone webapp or integrated to GeoServer. If we want to go for the first option, we will also require the following JAVA_OPTS options: | ||
|
||
``` | ||
JAVA_OPTS="$JAVA_OPTS -DGEOWEBCACHE_CACHE_DIR=/opt/ " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/opt/ ?
docs/setup/tomcat.md
Outdated
## Be careful | ||
|
||
Remember that the geOrchestra binaries must be built according to the tomcat configuration described above. | ||
By default, forking the template configuration should guarantee this. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
???
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was already present in the documentation, even if it appears in the diff, I have not touched this part. We can probably get rid of the paragraph, though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some bits to change ... huge improvement, thanks !
documentation update:
Tests: the guide has been followed from scratch into a vagrant debian buster VM. Of course, every features have not been tested thoroughly, but I finished with a running georchestra (login onto CAS / SP OK, geoserver along with integrated geofence OK, GN OK - MD editing tested ...).