Skip to content
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

Good neighbour #166

Merged
merged 5 commits into from Jun 12, 2018
Merged

Good neighbour #166

merged 5 commits into from Jun 12, 2018

Conversation

lonemadmax
Copy link
Contributor

Be nice and don't overwrite tomcat and nginx system configuration, and don't kill them when stopping freeciv-web.

Users, especially developers, may install freeciv-web alongside other
tomcat webapps. Be nice and don't hoard ROOT.
If so configured, use tomcat-manager to stop just freeciv-web and not
the whole tomcat server.
nginx.conf is an installation file, under the responsibility of the site
admin. The default upstream content already supports loading of several
virtual servers or apps defined under sites-enabled, so use that instead
of greedy full control.

Some more work may still be needed to really share nginx with other apps,
like declaring a server name or wrapping everything in a freeciv-web
specific location.
When stopping freeciv-web, remove it from sites-enabled and tell nginx
to reload its configuration, instead of stopping all of nginx.
Installing freeciv-web doesn't overwrite nginx and tomcat config anymore.
@ghost
Copy link

ghost commented Jun 12, 2018

looks good. please merge.

@lonemadmax lonemadmax merged commit 9d0b584 into develop Jun 12, 2018
@lonemadmax lonemadmax deleted the good-neighbour branch June 12, 2018 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant