aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.github/CONTRIBUTING.md12
-rw-r--r--CODE_OF_CONDUCT.md3
2 files changed, 7 insertions, 8 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c5e62e44d..7cc753b1a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -88,7 +88,7 @@ First, you should use a server or PC with at least 4GB of RAM. Less RAM may lead
88[the steps](/support/doc/dependencies.md) 88[the steps](/support/doc/dependencies.md)
89to install the dependencies. 89to install the dependencies.
901) Install [parallel](https://www.gnu.org/software/parallel/) to be able to run tests. 901) Install [parallel](https://www.gnu.org/software/parallel/) to be able to run tests.
911) Fork the Github repository. 911) Fork the GitHub repository.
921) Run the following commands. 921) Run the following commands.
93``` 93```
94git clone https://github.com/Chocobozzz/PeerTube 94git clone https://github.com/Chocobozzz/PeerTube
@@ -98,7 +98,7 @@ yarn install --pure-lockfile
98``` 98```
99 99
100Note that development is done on the `develop` branch. If you want to hack on 100Note that development is done on the `develop` branch. If you want to hack on
101Peertube, you should switch to that branch. Also note that you have to repeat 101PeerTube, you should switch to that branch. Also note that you have to repeat
102the `yarn install --pure-lockfile` command. 102the `yarn install --pure-lockfile` command.
103 103
104When you create a new branch you should also tell to use your repo for upload 104When you create a new branch you should also tell to use your repo for upload
@@ -125,7 +125,7 @@ sudo -u postgres psql -c "CREATE EXTENSION pg_trgm;" peertube_dev
125sudo -u postgres psql -c "CREATE EXTENSION unaccent;" peertube_dev 125sudo -u postgres psql -c "CREATE EXTENSION unaccent;" peertube_dev
126``` 126```
127 127
128Peertube also requires a running redis server, no special setup is needed for 128PeerTube also requires a running redis server, no special setup is needed for
129this. 129this.
130 130
131In dev mode, administrator username is **root** and password is **test**. 131In dev mode, administrator username is **root** and password is **test**.
@@ -278,7 +278,7 @@ You can see the list on the [dedicated documentation](/support/doc/development/l
278 278
279### CI 279### CI
280 280
281PeerTube uses Github actions to run tests every time a commit is pushed or a PR is opened. 281PeerTube uses GitHub actions to run tests every time a commit is pushed or a PR is opened.
282You can find more information about these tasks on the [dedicated documentation](/support/doc/development/ci.md). 282You can find more information about these tasks on the [dedicated documentation](/support/doc/development/ci.md).
283 283
284### Monitoring 284### Monitoring
@@ -288,11 +288,11 @@ To do so, see the [dedicated documentation](/support/doc/development/monitoring.
288 288
289### Test live stream 289### Test live stream
290 290
291To easily test a live on PeerTube: 291To easily test a live stream on PeerTube:
292 * Enable live support in web admin configuration 292 * Enable live support in web admin configuration
293 * Create a permanent live on the PeerTube instance 293 * Create a permanent live on the PeerTube instance
294 * Get the **RTMP URL** and the **Live stream key** 294 * Get the **RTMP URL** and the **Live stream key**
295 * Send the live to PeerTube using `ffmpeg` using a local video: 295 * Send the live stream to PeerTube using `ffmpeg` using a local video:
296 296
297``` 297```
298ffmpeg -stream_loop -1 -re -i any-video.mp4 -c copy -f flv rtmp://{RTMP URL}/live/{STREAM KEY} 298ffmpeg -stream_loop -1 -re -i any-video.mp4 -c copy -f flv rtmp://{RTMP URL}/live/{STREAM KEY}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index d8056773e..9bb878457 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -7,7 +7,6 @@ In order to create an open and welcoming environment, we as contributors and mai
7* age 7* age
8* body size 8* body size
9* disability 9* disability
10* ethnicity
11* gender identity and expression 10* gender identity and expression
12* level of experience 11* level of experience
13* education 12* education
@@ -63,7 +62,7 @@ We also reserve the right to temporarily or permanently ban any contributor for
63 62
64## Scope 63## Scope
65 64
66This code of conduct applies whenever you are representing the project or community. For example you may be: 65This code of conduct applies whenever you are representing the project or community. For example, you may be:
67 66
68* working in a project space online or in the public (i.e.: github.com, framacolibri.org, IRC) 67* working in a project space online or in the public (i.e.: github.com, framacolibri.org, IRC)
69* using an official project email address 68* using an official project email address