From 2c108dabb8058b65ffd6ca7649af833154000918 Mon Sep 17 00:00:00 2001 From: Dimitri Herzog Date: Tue, 7 Mar 2023 17:25:04 +0100 Subject: [PATCH] chore: change branch name to "main" (#744) --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/development-docker.yml | 2 +- .github/workflows/docs.yml | 2 +- README.md | 2 +- docs/index.md | 2 +- docs/prometheus_grafana.md | 6 +++--- server/server_endpoints.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6678fac3..cd1290f3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '33 15 * * 1' diff --git a/.github/workflows/development-docker.yml b/.github/workflows/development-docker.yml index 81d1d353..a06d48d7 100644 --- a/.github/workflows/development-docker.yml +++ b/.github/workflows/development-docker.yml @@ -3,7 +3,7 @@ name: Development docker build on: push: branches: - - master + - main permissions: security-events: write diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 63565d8f..40c46056 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ on: push: branches: - docs - - master + - main jobs: deploy: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 2ae9f1ee..0ea08bcf 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ [![Donation](https://img.shields.io/badge/buy%20me%20a%20coffee-donate-blueviolet.svg)](https://ko-fi.com/0xerr0r)

- +

# Blocky diff --git a/docs/index.md b/docs/index.md index 5bf3c6b2..713c4acd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,7 +1,7 @@ # Blocky
- +
Blocky is a DNS proxy and ad-blocker for the local network written in Go with following features: diff --git a/docs/prometheus_grafana.md b/docs/prometheus_grafana.md index 290889fd..9d05468c 100644 --- a/docs/prometheus_grafana.md +++ b/docs/prometheus_grafana.md @@ -25,7 +25,7 @@ Following metrics will be exported: ### Grafana dashboard Example [Grafana](https://grafana.com/) dashboard -definition [as JSON](https://github.com/0xERR0R/blocky/blob/master/docs/blocky-grafana.json) +definition [as JSON](https://github.com/0xERR0R/blocky/blob/main/docs/blocky-grafana.json) or [at grafana.com](https://grafana.com/grafana/dashboards/13768) ![grafana-dashboard](grafana-dashboard.png). @@ -45,7 +45,7 @@ blocky, prometheus (with configured scraper for blocky) and grafana with prometh ## MySQL / MariaDB If database query logging is activated (see [Query logging](configuration.md#query-logging)), you can use following -Grafana Dashboard [as JSON](https://github.com/0xERR0R/blocky/blob/master/docs/blocky-query-grafana.json) +Grafana Dashboard [as JSON](https://github.com/0xERR0R/blocky/blob/main/docs/blocky-query-grafana.json) or [at grafana.com](https://grafana.com/grafana/dashboards/14980) ![grafana-dashboard](grafana-query-dashboard.png). @@ -54,6 +54,6 @@ Please define the MySQL source in Grafana, which points to the database with blo ## Postgres -The JSON for a Grafana dashboard equivalent to the MySQL/MariaDB version is located [here](https://github.com/0xERR0R/blocky/blob/master/docs/blocky-query-grafana-postgres.json) +The JSON for a Grafana dashboard equivalent to the MySQL/MariaDB version is located [here](https://github.com/0xERR0R/blocky/blob/main/docs/blocky-query-grafana-postgres.json) --8<-- "docs/includes/abbreviations.md" diff --git a/server/server_endpoints.go b/server/server_endpoints.go index 64d3b365..7346f9aa 100644 --- a/server/server_endpoints.go +++ b/server/server_endpoints.go @@ -264,7 +264,7 @@ func configureRootHandler(cfg *config.Config, router *chi.Mux) { Title string } - swaggerVersion := "master" + swaggerVersion := "main" if util.Version != "undefined" { swaggerVersion = util.Version }