diff --git a/.github/workflows/cargo-bloat.yml b/.github/workflows/cargo-bloat.yml index 2d837bcf..d95fb54a 100644 --- a/.github/workflows/cargo-bloat.yml +++ b/.github/workflows/cargo-bloat.yml @@ -3,10 +3,10 @@ name: cargo-bloat on: push: branches: - - master + - main pull_request: branches: - - master + - main paths: - '**/Cargo.toml' - '**/Cargo.lock' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 546709de..87419f9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,12 @@ name: CI on: push: branches: - - master + - main - staging - trying pull_request: branches: - - master + - main jobs: check-license-headers: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bae19a79..118cbe34 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,12 +3,12 @@ name: Docker on: push: branches: - - master + - main tags: - '*' pull_request: branches: - - master + - main jobs: build-and-push-docker-image: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 147f0028..0c04271c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,7 +3,7 @@ name: GitHub Pages on: push: branches: - - master + - main tags: - '*' diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml index 5b888568..c743be3b 100644 --- a/.github/workflows/it.yml +++ b/.github/workflows/it.yml @@ -3,12 +3,12 @@ name: Integration tests on: push: branches: - - master + - main - staging - trying pull_request: branches: - - master + - main jobs: build-test-binary: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df99c21c..d8bb641f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,7 @@ build test binary for docker tests: services: - "docker:dind" only: - - master + - main dependencies: [] # don't download artifacts from previous jobs cache: paths: @@ -193,7 +193,7 @@ package and push image for feature-branch: only: - branches except: - - master + - main - /^develop\/.*$/ script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY @@ -214,7 +214,7 @@ package and push image for tags: - docker build --pull -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}" . - docker push "${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}" -package and push image on master: +package and push image on main: stage: package image: docker:latest tags: @@ -222,7 +222,7 @@ package and push image on master: services: - docker:dind only: - - master + - main script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build --pull -t $CI_REGISTRY_IMAGE . diff --git a/CHANGELOG.md b/CHANGELOG.md index b255549c..4d5ee54f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ You can now specify the `expose_via_ipv6`-key within a wider-world-to-container-rule to configure whether the service should be exposed via IPv6 or not (the default is `true`). - _(Please note that further requirements need to be fulfilled such that exposing services via IPv6 to works, [see here](https://github.com/pitkley/dfw/blob/master/README.md#ipv6support).)_ + _(Please note that further requirements need to be fulfilled such that exposing services via IPv6 to works, [see here](https://github.com/pitkley/dfw/blob/main/README.md#ipv6support).)_ * Ensure consistent behaviour regardless of whether `[global_defaults]` has been specified or not. diff --git a/README.md b/README.md index 03101c3e..568531d7 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ But if you have, or are simply interested in trying DFW out, take a look at the You can of course bind the port to `127.0.0.1`, but you have to be explicit about that, which is easy to forget. -[example-reverseproxy]: https://github.com/pitkley/dfw/tree/master/examples/reverseproxy +[example-reverseproxy]: https://github.com/pitkley/dfw/tree/main/examples/reverseproxy ## Getting started @@ -117,11 +117,11 @@ Once you have decided which backend you want to use, please consult the backend- * [nftables][docs-nftables] * [iptables][docs-iptables] -[migration-v0.x-to-v1.0]: https://github.com/pitkley/dfw/blob/master/docs/migration/v0.x-to-v1.0.md -[migration-v0.x-to-v1.2]: https://github.com/pitkley/dfw/blob/master/docs/migration/v0.x-to-v1.2.md -[migration-v1.x-to-v1.2]: https://github.com/pitkley/dfw/blob/master/docs/migration/v1.x-to-v1.2.md -[docs-nftables]: https://github.com/pitkley/dfw/blob/master/docs/GETTING-STARTED-nftables.md -[docs-iptables]: https://github.com/pitkley/dfw/blob/master/docs/GETTING-STARTED-iptables.md +[migration-v0.x-to-v1.0]: https://github.com/pitkley/dfw/blob/main/docs/migration/v0.x-to-v1.0.md +[migration-v0.x-to-v1.2]: https://github.com/pitkley/dfw/blob/main/docs/migration/v0.x-to-v1.2.md +[migration-v1.x-to-v1.2]: https://github.com/pitkley/dfw/blob/main/docs/migration/v1.x-to-v1.2.md +[docs-nftables]: https://github.com/pitkley/dfw/blob/main/docs/GETTING-STARTED-nftables.md +[docs-iptables]: https://github.com/pitkley/dfw/blob/main/docs/GETTING-STARTED-iptables.md ## Configuration @@ -158,7 +158,7 @@ The general configuration happens across six categories: **See the [examples][examples] and [configuration types][types.rs] for detailed descriptions and examples of every configuration section.** [docker-networks]: https://docs.docker.com/engine/userguide/networking/ -[examples]: https://github.com/pitkley/dfw/tree/master/examples +[examples]: https://github.com/pitkley/dfw/tree/main/examples [types.rs]: https://dfw.rs/latest/dfw/types/index.html ## IPv6 support diff --git a/docs/GETTING-STARTED-iptables.md b/docs/GETTING-STARTED-iptables.md index c0e896bb..5fa08726 100644 --- a/docs/GETTING-STARTED-iptables.md +++ b/docs/GETTING-STARTED-iptables.md @@ -78,7 +78,7 @@ The general configuration happens across six categories: **See the [examples][examples] and [configuration types][types.rs] for detailed descriptions and examples of every configuration section.** [docker-networks]: https://docs.docker.com/engine/userguide/networking/ -[examples]: https://github.com/pitkley/dfw/tree/master/examples +[examples]: https://github.com/pitkley/dfw/tree/main/examples [types.rs]: https://dfw.rs/latest/dfw/types/index.html ## Running DFW diff --git a/docs/GETTING-STARTED-nftables.md b/docs/GETTING-STARTED-nftables.md index fe9d727b..e6718d13 100644 --- a/docs/GETTING-STARTED-nftables.md +++ b/docs/GETTING-STARTED-nftables.md @@ -130,7 +130,7 @@ The general configuration happens across six categories: **See the [examples][examples] and [configuration types][types.rs] for detailed descriptions and examples of every configuration section.** [docker-networks]: https://docs.docker.com/engine/userguide/networking/ -[examples]: https://github.com/pitkley/dfw/tree/master/examples +[examples]: https://github.com/pitkley/dfw/tree/main/examples [types.rs]: https://dfw.rs/latest/dfw/types/index.html ## Running DFW diff --git a/docs/migration/v1.x-to-v1.2.md b/docs/migration/v1.x-to-v1.2.md index ad0a4e5c..46dc9c37 100644 --- a/docs/migration/v1.x-to-v1.2.md +++ b/docs/migration/v1.x-to-v1.2.md @@ -12,7 +12,7 @@ If you are upgrading from a previous 1.x-version and: Follow this document. -[migration-v0.x-to-v1.2]: https://github.com/pitkley/dfw/blob/master/docs/migration/v0.x-to-v1.2.md +[migration-v0.x-to-v1.2]: https://github.com/pitkley/dfw/blob/main/docs/migration/v0.x-to-v1.2.md ---