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

Commits on Jun 3, 2018

  1. Don't overwrite tomcat's ROOT

    Users, especially developers, may install freeciv-web alongside other
    tomcat webapps. Be nice and don't hoard ROOT.
    lonemadmax committed Jun 3, 2018
    Configuration menu
    Copy the full SHA
    86c955e View commit details
    Browse the repository at this point in the history
  2. Don't bring tomcat down with freeciv-web

    If so configured, use tomcat-manager to stop just freeciv-web and not
    the whole tomcat server.
    lonemadmax committed Jun 3, 2018
    Configuration menu
    Copy the full SHA
    eaf4e6c View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Don't overwrite nginx.conf

    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.
    lonemadmax committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    ce809db View commit details
    Browse the repository at this point in the history
  2. Don't bring nginx down with freeciv-web

    When stopping freeciv-web, remove it from sites-enabled and tell nginx
    to reload its configuration, instead of stopping all of nginx.
    lonemadmax committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    da2c347 View commit details
    Browse the repository at this point in the history
  3. doc update

    Installing freeciv-web doesn't overwrite nginx and tomcat config anymore.
    lonemadmax committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    3383384 View commit details
    Browse the repository at this point in the history