Change references to master branch into main

.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'

.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:

.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:

.github/workflows/gh-pages.yml

@@ -3,7 +3,7 @@ name: GitHub Pages
 on:
   push:
     branches:
-    - master
+    - main
     tags:
     - '*'
 

.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:

.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,15 +214,15 @@ 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:
   - privileged
   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 .

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.
 

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.
 </sub>
 
-[example-reverseproxy]: https://github.com/pitkley/dfw/tree/master/examples/reverseproxy
+[example-reverseproxy]: https://github.com/pitkley/dfw/tree/main/examples/reverseproxy
 
 ## <a name="gettingstarted"></a> 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
 
 ## <a name="configuration"></a> 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
 
 ## <a name="ipv6support"></a> IPv6 support

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
 
 ## <a name="runningdfw"></a> Running DFW

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
 
 ## <a name="runningdfw"></a> Running DFW

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
 
 ---