Skip to content

Commit f7ee9f3

Browse files
MountainGod2MountainGod2
authored
Merge branch 'linuxserver:master' into develop
2 parents d6b9854 + 8ff3366 commit f7ee9f3

281 files changed

Lines changed: 2811 additions & 610 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ trim_trailing_whitespace = false
1111
[{*.conf,*.conf.sample}]
1212
indent_style = space
1313
indent_size = 4
14+
trim_trailing_whitespace = true

‎.github/CONTRIBUTING.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Contributing to reverse-proxy-confs
2+
3+
## Gotchas
4+
5+
* While contributing make sure to make all your changes before creating a Pull Request
6+
* Read, and fill the Pull Request template
7+
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
8+
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
9+
10+
### Styling
11+
12+
* Indentation: 4 spaces
13+
* Line-endings: LF
14+
* Trailing newline: yes
15+
16+
### Requirements
17+
18+
* Must have the date on the first line, in YYYY/MM/DD format
19+
* For subdomains, add a comment for a needed CNAME
20+
* If the application needs further configuration, specify this in a comment
21+
22+
* In most cases we want the comments for Authelia, ldap and basic auth to be present
23+
* If the application has known API endpoints, we prefer these to be exempt from auth trough a location block (provided the application has security on the endpoint)
24+
25+
* Files must not be executeable

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: linuxserver
2+
open_collective: linuxserver

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Discord chat support
4+
url: https://discord.gg/YWrKVTn
5+
about: Realtime support / chat with the community and the team.
6+
7+
- name: Discourse discussion forum
8+
url: https://discourse.linuxserver.io
9+
about: Post on our community forum.
10+
11+
- name: Documentation
12+
url: https://docs.linuxserver.io/general/swag#preset-proxy-confs
13+
about: Documentation - information about how this repository works with SWAG.

‎.github/ISSUE_TEMPLATE/issue.bug.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Based on the issue template
2+
name: Bug report
3+
description: Create a report to help us improve. NOT TEMPLATE REQUESTS
4+
title: "[BUG] <title>"
5+
labels: [Bug]
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Is there an existing issue for this?
10+
description: Please search to see if an issue already exists for the bug you encountered.
11+
options:
12+
- label: I have searched the existing issues
13+
required: true
14+
- type: textarea
15+
attributes:
16+
label: Current Behavior
17+
description: Tell us what happens instead of the expected behavior.
18+
validations:
19+
required: true
20+
- type: textarea
21+
attributes:
22+
label: Expected Behavior
23+
description: Tell us what should happen.
24+
validations:
25+
required: false
26+
- type: textarea
27+
attributes:
28+
label: Steps To Reproduce
29+
description: Steps to reproduce the behavior.
30+
placeholder: |
31+
1. In this environment...
32+
2. With this config...
33+
3. Run '...'
34+
4. See error...
35+
validations:
36+
required: true

‎.github/ISSUE_TEMPLATE/issue.feature.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Based on the issue template
2+
name: Feature request
3+
description: Suggest an idea for this project. NOT TEMPLATE REQUESTS
4+
title: "[FEAT] <title>"
5+
labels: [enhancement]
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Is this a new feature request?
10+
description: Please search to see if a feature request already exists.
11+
options:
12+
- label: I have searched the existing issues
13+
required: true
14+
- type: textarea
15+
attributes:
16+
label: Wanted change
17+
description: Tell us what you want to happen.
18+
validations:
19+
required: true
20+
- type: textarea
21+
attributes:
22+
label: Reason for change
23+
description: Justify your request, why do you want it, what is the benefit.
24+
validations:
25+
required: true
26+
- type: textarea
27+
attributes:
28+
label: Proposed code change
29+
description: Do you have a potential code change in mind?
30+
validations:
31+
required: false

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,25 @@
22

33
[linuxserverurl]: https://linuxserver.io
44
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
5-
65

7-
<!--- Before submitting a pull request please check the following -->
6+
------------------------------
87

9-
<!--- That you have made a branch in your fork, we'd rather not merge from your master -->
10-
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
11-
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
12-
<!--- -->
8+
- [ ] I have read the [contributing](https://github.com/linuxserver/reverse-proxy-confs/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
139

14-
## Thanks, team linuxserver.io
10+
------------------------------
1511

12+
<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
13+
14+
## Description
15+
<!--- Describe your changes in detail -->
16+
17+
## Benefits of this PR and context
18+
<!--- Please explain why we should accept this PR. If this fixes an outstanding bug, please reference the issue # -->
19+
20+
## How Has This Been Tested?
21+
<!--- Please describe in detail how you tested your changes. -->
22+
<!--- Include details of your testing environment, and the tests you ran to -->
23+
<!--- see how your change affects other areas of the code, etc. -->
24+
25+
## Source / References
26+
<!--- Please include any forum posts/github links relevant to the PR -->

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

‎.github/workflows/call-invalid-issues-cron.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Mark stale issues and pull requests
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "30 1 * * *"
6+
7+
jobs:
8+
stale:
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
13+
secrets: inherit

‎.github/workflows/call_invalid_helper.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Comment on invalid interaction
2+
on:
3+
issues:
4+
types:
5+
- labeled
6+
jobs:
7+
add-comment-on-invalid:
8+
if: github.event.label.name == 'invalid'
9+
permissions:
10+
issues: write
11+
uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
12+
secrets: inherit

0 commit comments

Comments
 (0)