diff options
author | 2023-02-24 20:50:25 -0500 | |
---|---|---|
committer | 2023-02-24 20:50:25 -0500 | |
commit | 71b98ed838910173ec56c977f4892fd9c53da339 (patch) | |
tree | 16b90ac1333137ffc4df4f50e152ade351c458c8 /.github | |
parent | merges (diff) | |
parent | Merge pull request #5646 from NetSysFire/parsecd (diff) | |
download | firejail-71b98ed838910173ec56c977f4892fd9c53da339.tar.gz firejail-71b98ed838910173ec56c977f4892fd9c53da339.tar.zst firejail-71b98ed838910173ec56c977f4892fd9c53da339.zip |
Merge branch 'master' of ssh://github.com/netblue30/firejail
Diffstat (limited to '.github')
-rw-r--r-- | .github/.editorconfig | 3 | ||||
-rw-r--r-- | .github/ISSUE_TEMPLATE/bug_report.md | 2 | ||||
-rw-r--r-- | .github/pull_request_template.md | 20 |
3 files changed, 14 insertions, 11 deletions
diff --git a/.github/.editorconfig b/.github/.editorconfig new file mode 100644 index 000000000..eb5c699c5 --- /dev/null +++ b/.github/.editorconfig | |||
@@ -0,0 +1,3 @@ | |||
1 | [*.yml] | ||
2 | indent_size = 2 | ||
3 | indent_style = space | ||
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c8c6f40bd..53066013d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md | |||
@@ -81,7 +81,7 @@ output goes here | |||
81 | <details> | 81 | <details> |
82 | <summary>Output of <code>LC_ALL=C firejail --debug /path/to/program</code></summary> | 82 | <summary>Output of <code>LC_ALL=C firejail --debug /path/to/program</code></summary> |
83 | <p> | 83 | <p> |
84 | 84 | ||
85 | <!-- If the output is too long to embed it into the comment, | 85 | <!-- If the output is too long to embed it into the comment, |
86 | create a secret gist at https://gist.github.com/ and link it here. --> | 86 | create a secret gist at https://gist.github.com/ and link it here. --> |
87 | 87 | ||
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 7cb92a938..80945c8ba 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md | |||
@@ -1,17 +1,17 @@ | |||
1 | If your PR isn't about profiles or you have no idea how to do one of these, skip the following and go ahead with this PR. | 1 | If your PR isn't about profiles or you have no idea how to do one of these, skip the following and go ahead with this PR. |
2 | 2 | ||
3 | If you submit a PR for new profiles or changing profiles, please do the following: | 3 | If you submit a PR for new profiles or changing profiles, please do the following: |
4 | - The ordering of options follow the rules described in [/usr/share/doc/firejail/profile.template](https://github.com/netblue30/firejail/blob/master/etc/templates/profile.template). | 4 | - The ordering of options follow the rules described in [/usr/share/doc/firejail/profile.template](https://github.com/netblue30/firejail/blob/master/etc/templates/profile.template). |
5 | > Hint: The profile-template is very new. If you install firejail with your package manager, it may be missing. In order to follow the latest rules, it is recommended to use the template from the repository. | 5 | > Hint: The profile-template is very new. If you install firejail with your package manager, it may be missing. In order to follow the latest rules, it is recommended to use the template from the repository. |
6 | - Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py). | 6 | - Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py). |
7 | The path to it depends on your distro: | 7 | The path to it depends on your distro: |
8 | 8 | ||
9 | | Distro | Path | | 9 | | Distro | Path | |
10 | | ------ | ---- | | 10 | | ------ | ---- | |
11 | | Arch/Fedora | `/usr/lib64/firejail/sort.py` | | 11 | | Arch/Fedora | `/usr/lib64/firejail/sort.py` | |
12 | | Debian/Ubuntu/Mint | `/usr/lib/x86_64-linux-gnu/firejail/sort.py` | | 12 | | Debian/Ubuntu/Mint | `/usr/lib/x86_64-linux-gnu/firejail/sort.py` | |
13 | | local git clone | `contrib/sort.py` | | 13 | | local git clone | `contrib/sort.py` | |
14 | 14 | ||
15 | Note also that the sort.py script exists only since firejail `0.9.61`. | 15 | Note also that the sort.py script exists only since firejail `0.9.61`. |
16 | 16 | ||
17 | See also [CONTRIBUTING.md](/CONTRIBUTING.md). | 17 | See also [CONTRIBUTING.md](/CONTRIBUTING.md). |