diff --git a/README.md b/README.md index 1f2e572..c6b8409 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Instructions ## docker-compose -- if you run into problems. delete stale containers and: `docker rmi inspi4` and `docker volume prune` to make sure there are no stale images and volumes. +- if you are not starting from scratch. delete stale containers and: `docker rmi inspi4` and `docker volume rm inspi4_ssl` - copy `config.env.exmaple` to `config.env` and edit -- optional: if you intend to link, copy `include.default.conf` to `include.conf` and edit -- build: `docker-compose -f docker-compose.yml build` use: `docker-compose.linked.yml` if you intend to link. -- start: `docker-compose -f docker-compose.yml up -d` also use the linked variant if you intend to link. +- optional: if you intend to link, copy `include.default.conf` to `include.conf` and edit (see linking section below.) +- build: `docker-compose -f docker-compose.standalone.yml build` use: `docker-compose.linked.yml` if you intend to link. +- start: `docker-compose -f docker-compose.standalone.yml up -d` also use the linked variant if you intend to link. - ~~`docker build -t inspi4 -t inspi4:latest .`~~ - ~~`docker run -it --rm -e 'DEFAULT_BLOCK_HOST_MASK="nothing"' -net host inspi4`~~ @@ -16,7 +16,7 @@ # Linking - Run `docker exec -it ircd_ircd_linked_1 openssl x509 -sha256 -fingerprint -in /etc/ssl/inspircd/server.crt | tr -d ":" | tr '[:upper:]' '[:lower:]'` -to get the fingerprints. +to get the SSL fingerprints, the `fingerprint` refers to the remote SSL certificate fingerprint for each linking section. - On `hub.netcrave.network` add something like this to the `include.conf`: diff --git a/docker-compose.linked.yml b/docker-compose.linked.yml index e63b906..29db964 100644 --- a/docker-compose.linked.yml +++ b/docker-compose.linked.yml @@ -14,8 +14,8 @@ services: - log:/var/log/inspircd volumes: data: - name: data + name: inspi4_data ssl: - name: ssl + name: inspi4_ssl log: - name: log + name: inspi4_log diff --git a/docker-compose.yml b/docker-compose.standalone.yml similarity index 81% rename from docker-compose.yml rename to docker-compose.standalone.yml index 7fd655d..19a3533 100644 --- a/docker-compose.yml +++ b/docker-compose.standalone.yml @@ -13,8 +13,8 @@ services: - log:/var/log/inspircd volumes: data: - name: data + name: inspi4_data ssl: - name: ssl + name: inspi4_ssl log: - name: log + name: inspi4_log