Просмотр исходного кода

Merge pull request #4132 from luixxiul/fix

Add license information to files in reverse-proxies directory and ones related to project management and administration
pull/4136/head
Slavi Pantaleev 1 год назад
committed by GitHub
Родитель
Сommit
4b2c4d0df5
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: B5690EEEBB952194
17 измененных файлов: 121 добавлений и 1 удалений
  1. +10
    -1
      REUSE.toml
  2. +6
    -0
      bin/ansible-all-hosts.sh
  3. +5
    -0
      bin/rebuild-mautrix-meta-instagram.sh
  4. +6
    -0
      examples/reverse-proxies/README.md
  5. +8
    -0
      examples/reverse-proxies/apache/README.md
  6. +5
    -0
      examples/reverse-proxies/apache/matrix-client-element.conf
  7. +6
    -0
      examples/reverse-proxies/apache/matrix-domain.conf
  8. +6
    -0
      examples/reverse-proxies/caddy2-in-container/Caddyfile
  9. +7
    -0
      examples/reverse-proxies/caddy2-in-container/README.md
  10. +5
    -0
      examples/reverse-proxies/caddy2-in-container/docker-compose.yaml
  11. +9
    -0
      examples/reverse-proxies/caddy2/Caddyfile
  12. +10
    -0
      examples/reverse-proxies/caddy2/README.md
  13. +8
    -0
      examples/reverse-proxies/haproxy/README.md
  14. +5
    -0
      examples/reverse-proxies/haproxy/haproxy.cfg
  15. +9
    -0
      examples/reverse-proxies/nginx-proxy-manager/README.md
  16. +10
    -0
      examples/reverse-proxies/nginx/README.md
  17. +6
    -0
      examples/reverse-proxies/nginx/matrix.conf

+ 10
- 1
REUSE.toml Просмотреть файл

@@ -8,9 +8,18 @@ version = 1
[[annotations]]
path = [
".github/renovate.json",
"collections/requirements.yml",
"i18n/.gitignore",
"i18n/requirements.txt",
"i18n/PUBLISHED_LANGUAGES"
"i18n/PUBLISHED_LANGUAGES",
".editorconfig",
".envrc",
".gitattributes",
".gitignore",
".yamllint",
"flake.lock",
"flake.nix",
"requirements.yml"
]
SPDX-FileCopyrightText = "NONE"
SPDX-License-Identifier = "CC0-1.0"


+ 6
- 0
bin/ansible-all-hosts.sh Просмотреть файл

@@ -1,4 +1,10 @@
#!/usr/bin/env bash

# SPDX-FileCopyrightText: 2022 - 2024 MDAD project contributors
# SPDX-FileCopyrightText: 2024 Slavi Pantaleev
#
# SPDX-License-Identifier: AGPL-3.0-or-later

#
# Run the playbook on multiple hosts with different credentials with this script
# It defaults to ansible tags "setup-all,start". You can pass alternative tags


+ 5
- 0
bin/rebuild-mautrix-meta-instagram.sh Просмотреть файл

@@ -1,4 +1,9 @@
#!/bin/bash

# SPDX-FileCopyrightText: 2024 Slavi Pantaleev
#
# SPDX-License-Identifier: AGPL-3.0-or-later

set -euxo pipefail

# This script rebuilds the mautrix-meta-instagram Ansible role, using the mautrix-meta-messenger role as a source.


+ 6
- 0
examples/reverse-proxies/README.md Просмотреть файл

@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2024 Slavi Pantaleev

SPDX-License-Identifier: AGPL-3.0-or-later
-->

## Using other reverse-proxies for fronting the integrated Traefik reverse-proxy

This directory contains sample configuration for various webservers, showing you how to put these reverse-proxies in front of the integrated Traefik reverse-proxy used by the playbook.


+ 8
- 0
examples/reverse-proxies/apache/README.md Просмотреть файл

@@ -1,3 +1,11 @@
<!--
SPDX-FileCopyrightText: 2019 - 2024 Slavi Pantaleev
SPDX-FileCopyrightText: 2024 Rubén Cabrera
SPDX-FileCopyrightText: 2024 Suguru Hirahara

SPDX-License-Identifier: AGPL-3.0-or-later
-->

# Apache reverse-proxy

This directory contains sample files that show you how to front the integrated [Traefik](https://traefik.io/) reverse-proxy webserver with your Apache reverse-proxy.


+ 5
- 0
examples/reverse-proxies/apache/matrix-client-element.conf Просмотреть файл

@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: 2019 - 2024 Slavi Pantaleev
# SPDX-FileCopyrightText: 2024 Suguru Hirahara
#
# SPDX-License-Identifier: AGPL-3.0-or-later

# This is a sample file demonstrating how to set up reverse-proxy for element.example.com.
# If you're not using Element Web (`matrix_client_element_enabled: false`), you won't need this.



+ 6
- 0
examples/reverse-proxies/apache/matrix-domain.conf Просмотреть файл

@@ -1,3 +1,9 @@
# SPDX-FileCopyrightText: 2024 MDAD project contributors
# SPDX-FileCopyrightText: 2024 Slavi Pantaleev
# SPDX-FileCopyrightText: 2024 Suguru Hirahara
#
# SPDX-License-Identifier: AGPL-3.0-or-later

# This is a sample file demonstrating how to set up reverse-proxy for matrix.example.com

<VirtualHost *:80>


+ 6
- 0
examples/reverse-proxies/caddy2-in-container/Caddyfile Просмотреть файл

@@ -1,3 +1,9 @@
# SPDX-FileCopyrightText: 2024 MDAD project contributors
# SPDX-FileCopyrightText: 2024 Slavi Pantaleev
# SPDX-FileCopyrightText: 2024 Suguru Hirahara
#
# SPDX-License-Identifier: AGPL-3.0-or-later

matrix.example.com {

handle {


+ 7
- 0
examples/reverse-proxies/caddy2-in-container/README.md Просмотреть файл

@@ -1,3 +1,10 @@
<!--
SPDX-FileCopyrightText: 2024 MDAD project contributors
SPDX-FileCopyrightText: 2024 Suguru Hirahara

SPDX-License-Identifier: AGPL-3.0-or-later
-->

# Caddy reverse-proxy fronting the playbook's integrated Traefik reverse-proxy

This directory contains a sample config that shows you how to front the integrated [Traefik](https://traefik.io/) reverse-proxy webserver with your own **containerized** [Caddy](https://caddyserver.com/) reverse-proxy. If you have a server with a Caddy container already serving several applications and you want to install Matrix on it (with no changes to existing traffic routing), then this guide is for you.


+ 5
- 0
examples/reverse-proxies/caddy2-in-container/docker-compose.yaml Просмотреть файл

@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: 2024 MDAD project contributors
# SPDX-FileCopyrightText: 2024 Suguru Hirahara
#
# SPDX-License-Identifier: AGPL-3.0-or-later

---
version: "3.9"



+ 9
- 0
examples/reverse-proxies/caddy2/Caddyfile Просмотреть файл

@@ -1,3 +1,12 @@
# SPDX-FileCopyrightText: 2020 - 2023 MDAD project contributors
# SPDX-FileCopyrightText: 2020 Olaf Schoenwald
# SPDX-FileCopyrightText: 2020 Panagiotis Vasilopoulos
# SPDX-FileCopyrightText: 2021 - 2024 Slavi Pantaleev
# SPDX-FileCopyrightText: 2022 François Darveau
# SPDX-FileCopyrightText: 2024 Suguru Hirahara
#
# SPDX-License-Identifier: AGPL-3.0-or-later

matrix.example.com {

handle {


+ 10
- 0
examples/reverse-proxies/caddy2/README.md Просмотреть файл

@@ -1,3 +1,13 @@
<!--
SPDX-FileCopyrightText: 2020 - 2023 MDAD project contributors
SPDX-FileCopyrightText: 2021 Rafael Girão
SPDX-FileCopyrightText: 2024 Rubén Cabrera
SPDX-FileCopyrightText: 2024 Slavi Pantaleev
SPDX-FileCopyrightText: 2024 Suguru Hirahara

SPDX-License-Identifier: AGPL-3.0-or-later
-->

# Caddy reverse-proxy fronting the playbook's integrated Traefik reverse-proxy

This directory contains a sample config that shows you how to front the integrated [Traefik](https://traefik.io/) reverse-proxy webserver with your own [Caddy](https://caddyserver.com/) reverse-proxy.


+ 8
- 0
examples/reverse-proxies/haproxy/README.md Просмотреть файл

@@ -1,3 +1,11 @@
<!--
SPDX-FileCopyrightText: 2019 MDAD project contributors
SPDX-FileCopyrightText: 2024 Rubén Cabrera
SPDX-FileCopyrightText: 2024 Slavi Pantaleev

SPDX-License-Identifier: AGPL-3.0-or-later
-->

# HAproxy reverse-proxy

This directory contains sample files that show you how to do reverse-proxying using HAproxy.


+ 5
- 0
examples/reverse-proxies/haproxy/haproxy.cfg Просмотреть файл

@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: 2019 MDAD project contributors
# SPDX-FileCopyrightText: 2020 - 2024 Slavi Pantaleev
#
# SPDX-License-Identifier: AGPL-3.0-or-later

global
log /dev/log local0
log /dev/log local1 notice


+ 9
- 0
examples/reverse-proxies/nginx-proxy-manager/README.md Просмотреть файл

@@ -1,3 +1,12 @@
<!--
SPDX-FileCopyrightText: 2024 Gouthaman Raveendran
SPDX-FileCopyrightText: 2024 MDAD project contributors
SPDX-FileCopyrightText: 2024 Slavi Pantaleev
SPDX-FileCopyrightText: 2024 Suguru Hirahara

SPDX-License-Identifier: AGPL-3.0-or-later
-->

# Nginx Proxy Manager fronting the playbook's integrated Traefik reverse-proxy

Similar to standard nginx, [Nginx Proxy Manager](https://nginxproxymanager.com/) provides nginx capabilities but inside a pre-built Docker container. With the ability for managing proxy hosts and automatic SSL certificates via a simple web interface.


+ 10
- 0
examples/reverse-proxies/nginx/README.md Просмотреть файл

@@ -1,3 +1,13 @@
<!--
SPDX-FileCopyrightText: 2023 - 2024 MDAD project contributors
SPDX-FileCopyrightText: 2023 - 2024 Slavi Pantaleev
SPDX-FileCopyrightText: 2023 Jost Alemann
SPDX-FileCopyrightText: 2024 Rubén Cabrera
SPDX-FileCopyrightText: 2024 Suguru Hirahara

SPDX-License-Identifier: AGPL-3.0-or-later
-->

# Nginx reverse-proxy fronting the playbook's integrated Traefik reverse-proxy

This directory contains a sample config that shows you how to use the [nginx](https://nginx.org/) webserver to front the integrated [Traefik](https://traefik.io/) reverse-proxy webserver with another reverse-proxy.


+ 6
- 0
examples/reverse-proxies/nginx/matrix.conf Просмотреть файл

@@ -1,3 +1,9 @@
# SPDX-FileCopyrightText: 2023 - 2024 Jost Alemann
# SPDX-FileCopyrightText: 2024 - 2025 Suguru Hirahara
# SPDX-FileCopyrightText: 2024 Slavi Pantaleev
#
# SPDX-License-Identifier: AGPL-3.0-or-later

server {
# TODO: once per IP and port you should add `reuseport`, if you don't have that in any other nginx config file, add it here by uncommenting the lines below and commenting the one after with `quic` but without `reuseport`
#listen 443 quic reuseport;


Загрузка…
Отмена
Сохранить