diff --git a/.env.example b/.env.example index 84ec63c..bc6b40e 100644 --- a/.env.example +++ b/.env.example @@ -4,7 +4,8 @@ DOMAIN="" SERVER_NAME="" APP_PASSWORD="" MYSQL_PASSWORD="" +#COMPOSE_PROJECT_NAME="" #API KEYS CCP_SSO_CLIENT_ID="" CCP_SSO_SECRET_KEY="" -CCP_ESI_SCOPES="esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1" \ No newline at end of file +CCP_ESI_SCOPES="esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1" diff --git a/README.md b/README.md index 28d6ff1..ffa6bf2 100644 --- a/README.md +++ b/README.md @@ -1,70 +1,12 @@ # Pathfinder Container - -**Pathfinder Container** is a docker-compose setup that contains a hassle free out of the box setup for [Pathfinder](https://developers.eveonline.com/https://github.com/exodus4d/pathfinder). - -**Features** -* Setup Script for easy setup -* Password Protection of the setup page -* Socket Server running out of the box -* Automatic Restart in-case of crash -* Easy update with git tags -### How to run it - -**Prerequisites**: -* [docker](https://docs.docker.com/) -* [docker-compose](https://docs.docker.com/) - -1. **Create an [API-Key](https://developers.eveonline.com/) with the scopes listed in the [wiki](https://github.com/exodus4d/pathfinder/wiki/SSO-ESI)** - -2. **Clone the repo** -```shell -git clone --recurse-submodules https://gitlab.com/techfreak/pathfinder-container -``` - -## Setup Script -3. **Run the setup script** -```shell -chmod +x setup.sh -./setup.sh -``` - -4. **Profit ! Connect it to nginx or let traefik discover it** -## Running it manually -3. **Edit the .env file and make sure every config option has an entry.** -```shell -#the folder path of this folder e.g /home/tech/Development/DOCKER/pathfinder-container -path="" -CONTAINER_NAME="pf" -DOMAIN="" -SERVER_NAME="" -APP_PASSWORD="" -MYSQL_PASSWORD="" -CCP_SSO_CLIENT_ID="" -CCP_SSO_SECRET_KEY="" -CCP_ESI_SCOPES="esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1" -``` - -4. **Build & Run it** -```shell -docker-compose build && docker-compose up -d -``` - -5. **Open the http://< your-domain >/setup page. Your username is pf and password is the password you set in APP_PASSWORD. Click on create database for eve_universe and pathfinder. And click on setup tables && fix column/keys.** - - -6. **Go back to your console and insert the eve universe dump with this command ** -```shell -docker-compose exec pfdb /bin/sh -c "unzip -p eve_universe.sql.zip | mysql -u root -p\$MYSQL_ROOT_PASSWORD eve_universe"; -``` - -7. **Profit ! Connect it to nginx or let traefik discover it** +Private fork of techfreak's [Pathfinder-container](https://gitlab.com/techfreak/pathfinder-container/) docker-compose solution for Pathfinder using caddy2 ### Acknowledgments * [exodus4d](https://github.com/exodus4d/) for pathfinder * [Markus Geiger](https://gist.github.com/blurayne/f63c5a8521c0eeab8e9afd8baa45c65e) for his awesome bash menu ### Authors -* techfreak +* [techfreak](https://gitlab.com/techfreak) ### License This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details diff --git a/config/pathfinder/pathfinder.ini b/config/pathfinder/pathfinder.ini index d198b06..0500cf5 100644 --- a/config/pathfinder/pathfinder.ini +++ b/config/pathfinder/pathfinder.ini @@ -77,7 +77,7 @@ MODE_MAINTENANCE = 0 ; Syntax: String (comma separated) ; Default: CHARACTER = -CORPORATION = +CORPORATION = 98567606,98581604,98374903 ALLIANCE = [PATHFINDER.CHARACTER] diff --git a/docker-compose.yml b/docker-compose.yml index 589788b..25d4a9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,21 +1,6 @@ version: "3.8" services: - caddy: - image: lucaslorentz/caddy-docker-proxy:ci-alpine - container_name: caddy - ports: - - 80:80 - - 443:443 - networks: - - caddy - volumes: - - /var/run/docker.sock:/var/run/docker.sock - # this volume is needed to keep the certificates - # otherwise, new ones will be re-issued upon restart - - caddy_data:/data - labels: - caddy.email: carl.egal@gmail.com pfdb: image: bianjp/mariadb-alpine:latest environment: @@ -62,7 +47,7 @@ services: env_file: - .env labels: - caddy: test.goryn.wtf + caddy: map.goryn.wtf caddy.reverse_proxy: "{{upstreams 80}}" networks: - pf @@ -83,10 +68,8 @@ services: restart: always volumes: - data: db_data: redis_data: - caddy_data: {} networks: pf: caddy: