X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.html;h=e2f3a196e24864656b205f166d869ce39e57aa95;hb=728a1236aece26bce6452c440cf85622548afab9;hp=5703d5a2e0daef72ac3da61b82cf64a45c99900f;hpb=b15fe00f7409b27573e162192530bc73e3f918b1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 5703d5a2e..e2f3a196e 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html @@ -1,3 +1,4 @@ +

Configuration

@@ -47,11 +48,13 @@
- + +
@@ -59,11 +62,13 @@
- + +
@@ -157,11 +162,11 @@
- +
A single person? A non-profit? A company?
@@ -169,35 +174,35 @@
- +
To share your personal videos? To open registrations and allow people to upload what they want?
- + >
{{ formErrors.instance.creationReason }}
- +
It's important to know for users who want to register on your instance
- + >
{{ formErrors.instance.maintenanceLifetime }}
- +
With your own funds? With user donations? Advertising?
- + >
{{ formErrors.instance.businessModel }}
@@ -216,7 +221,7 @@
i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.
@@ -238,7 +243,7 @@
APPEARANCE
-
+
Use plugins & themes for more involved changes, or add slight customizations.
@@ -276,6 +281,58 @@
+
+
+
BROADCAST MESSAGE
+
+ Display a message on your instance +
+
+ +
+ + + +
+ +
+ +
+ +
+ +
+ +
+ +
+
{{ formErrors.broadcastMessage.level }}
+
+ +
+ + +
{{ formErrors.broadcastMessage.message }}
+
+ + + +
+
+
NEW USERS
@@ -290,10 +347,12 @@
⚠️ This functionality requires a lot of attention and extra moderation. + + - +
+ + {form.value['signup']['limit'], plural, =1 {user} other {users}} +
{{ formErrors.signup.limit }}
Signup won't be limited to a fixed number of users.
@@ -344,9 +406,9 @@
-
+
-
NEW VIDEOS
+
VIDEOS
@@ -357,7 +419,7 @@
@@ -378,7 +440,7 @@
Unless a user is marked as trusted, their videos will stay private until a moderator reviews them. @@ -393,6 +455,93 @@
+
+
+
SEARCH
+
+ +
+ + + + +
+ + + Allow your users to look up remote videos/actors that may not be federated with your instance + + +
+ +
+ + + Allow anonymous users to look up remote videos/actors that may not be federated with your instance + + +
+ + + + +
+ + +

⚠️ This functionality depends heavily on the moderation of instances followed by the search index you select.

+ + + You should only use moderated search indexes in production, or host your own. + + + + +
+ + +
{{ formErrors.search.searchIndex.url }}
+
+ +
+ +
+ +
+ + + Otherwise the local search stays used by default + + +
+ + + +
+ + + + + +
+
+
FEDERATION
@@ -448,7 +597,7 @@

⚠️ This functionality requires a lot of attention and extra moderation.

- You should only follow indexes you trust, or host your own. + You should only follow moderated indexes in production, or host your own. @@ -498,15 +647,7 @@
- - - - - Services - - - -
+
TWITTER
@@ -532,16 +673,16 @@
- Instance whitelisted by Twitter + Instance allowed by Twitter - If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.
- If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.

+ If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.
+ If the instance is not, we use an image link card that will redirect to your PeerTube instance.

Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on https://cards-dev.twitter.com/validator - to see if you instance is whitelisted. + to see if you instance is allowed. @@ -555,12 +696,33 @@ - - Advanced configuration + + Transcoding -
+
+
+
+ +
+ + Estimating a server's capacity to transcode and stream videos isn't easy and we can't tune PeerTube automatically. + + + However, you may want to read our guidelines before tweaking the following values. + + +
+ Read guidelines +
+
+ + +
+
+ +
TRANSCODING
@@ -573,128 +735,286 @@ -
- +
+ Transcoding enabled - - If you disable transcoding, many videos from your users will not work! - - -
- - - Allows users to upload .mkv, .mov, .avi and .flv videos. - - -
- -
- - - Allows users to upload audio files that will be merged with the preview file on upload. - - -
+
+ -
- - - Experimental, we suggest you to not disable webtorrent support for now - -

If you also enabled HLS support, it will multiply videos storage by 2

- -
- - If disabled, breaks federation with PeerTube instances < 2.1 - - + + Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, or .nut videos. +
- - - +
- - - Requires ffmpeg >= 4.1 - -

Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:

-
    -
  • Resolution change is smoother
    • -
  • Faster playback in particular with long videos
    • -
  • More stable playback (less bugs/infinite loading)
    • -
- -

If you also enabled WebTorrent support, it will multiply videos storage by 2

- - + +
Allows users to upload .mp3, .ogg, .wma, .flac, .aac, or .ac3 audio files.
+
The file will be merged in a still image video with the preview file on upload.
+
- +
+ +
+ + + +
+ + + +

If you also enabled HLS support, it will multiply videos storage by 2

+ +
+ + If disabled, breaks federation with PeerTube instances < 2.1 + + + +
+ + + +
+ + + + Requires ffmpeg >= 4.1 + +

Generate HLS playlists and fragmented MP4 files resulting in a better playback than with plain WebTorrent:

+
    +
  • Resolution change is smoother
    • +
  • Faster playback especially with long videos
    • +
  • More stable playback (less bugs/infinite loading)
    • +
+ +

If you also enabled WebTorrent support, it will multiply videos storage by 2

+ + + +
+ + +
+ + +
+ +
+ + +
+ + +
+ +
+
+
-
+
+ + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding + will claim at least {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding + +
{{ formErrors.transcoding.threads }}
-
+ + +
+
+ + + + + + Live streaming + + - +
+
+
LIVE
+
+ Enable users of your instance to stream live. +
+
-
- -
+
+ + + +
+ + + Allow live streaming + + + + ⚠️ Enabling live streaming requires trust in your users and extra moderation work + + + + +
- -
- + + If the user quota is reached, PeerTube will automatically terminate the live streaming +
+ +
+ +
+ + {form.value['live']['maxInstanceLives'], plural, =1 {live} other {lives}} +
+
+ +
+ +
+ + {form.value['live']['maxUserLives'], plural, =1 {live} other {lives}} +
+
+ +
+ +
+ +
+
+ + +
+ +
+
+ +
+
+
TRANSCODING
+
+ Same as VOD transcoding, transcoding live streams so that they are in a streamable form that any device can play. Requires a beefy CPU, and then some. +
+
+ +
+ + + + +
+ + + Transcoding enabled for live streams + +
-
+
+ + +
+ +
+ + +
+ + +
+ +
+
+ +
+ + + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding + will claim at least {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding + + +
+ +
+
{{ formErrors.live.transcoding.threads }}
+
+
-
+ + + + + Advanced configuration + + + +
CACHE
@@ -707,19 +1027,25 @@
- +
+ + {form.value['cache']['previews']['size'], plural, =1 {cached image} other {cached images}} +
{{ formErrors.cache.previews.size }}
- +
+ + {form.value['cache']['captions']['size'], plural, =1 {cached image} other {cached images}} +
{{ formErrors.cache.captions.size }}
 @@ -801,8 +1127,15 @@
- - It seems like the configuration is invalid. Please search for potential errors in the different tabs. + + It seems like the configuration is invalid. Please search for potential errors in the different tabs. + + + + You cannot allow live replay if you don't enable transcoding. + + +