From 39072b2f6ae04d2037ef2cb678ce9c352a370278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Str=C3=A4ter?= Date: Fri, 16 Jul 2021 15:39:09 +0200 Subject: Postgresql-setup init option for auth-host (#4253) * Set postgresql password authentication for host * Update postgresql-setup obsoleted argument syntax for initdb --- support/doc/dependencies.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md index cb344d2d7..8ea0c047d 100644 --- a/support/doc/dependencies.md +++ b/support/doc/dependencies.md @@ -101,7 +101,7 @@ sudo -H -u peertube CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtool 6. Initialize the PostgreSQL database: ``` -sudo postgresql-setup initdb +sudo PGSETUP_INITDB_OPTIONS='--auth-host=md5' postgresql-setup --initdb --unit postgresql ``` Now that dependencies are installed, before running PeerTube you should enable and start PostgreSQL and Redis: @@ -141,7 +141,7 @@ sudo ln -s /usr/bin/python3 /usr/bin/python 6. Initialize the PostgreSQL database: ``` -sudo postgresql-setup initdb +sudo PGSETUP_INITDB_OPTIONS='--auth-host=md5' postgresql-setup --initdb --unit postgresql ``` Now that dependencies are installed, before running PeerTube you should enable and start PostgreSQL and Redis: @@ -188,7 +188,7 @@ This is necessary because `ffmpeg` is not in the Fedora repos. 7. Run: ``` -sudo dnf install nginx ffmpeg postgresql-server postgresql-contrib openssl gcc-c++ make redis git vim oidentd +sudo dnf install nginx ffmpeg postgresql-server postgresql-contrib openssl gcc-c++ make redis git vim ffmpeg -version # Should be >= 4.1 g++ -v # Should be >= 5.x ``` @@ -208,7 +208,7 @@ _from [PostgreSQL documentation](https://www.postgresql.org/download/linux/redha ``` # PostgreSQL -sudo postgresql-setup initdb +sudo PGSETUP_INITDB_OPTIONS='--auth-host=md5' postgresql-setup --initdb --unit postgresql sudo systemctl enable postgresql.service sudo systemctl start postgresql.service # Nginx @@ -217,9 +217,6 @@ sudo systemctl start nginx.service # Redis sudo systemctl enable redis.service sudo systemctl start redis.service -# oidentd -sudo systemctl enable oidentd.service -sudo systemctl start oidentd.service ``` 10. Firewall -- cgit v1.2.3 From 3b3546496e178d1ef392c3df639925984985bc27 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 16 Jul 2021 15:58:57 +0200 Subject: Fix youtube-dl import for peertube videos --- server/helpers/youtube-dl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts index d003ea3cf..fdd361390 100644 --- a/server/helpers/youtube-dl.ts +++ b/server/helpers/youtube-dl.ts @@ -42,7 +42,7 @@ class YoutubeDL { getYoutubeDLInfo (opts?: string[]): Promise { return new Promise((res, rej) => { - let args = opts || [ '-j', '--flat-playlist' ] + let args = opts || [] if (CONFIG.IMPORT.VIDEOS.HTTP.FORCE_IPV4) { args.push('--force-ipv4') -- cgit v1.2.3 From 75103a4d89a8c1f879946a0341bd89c2999d9354 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 16 Jul 2021 16:00:31 +0200 Subject: Fix typo for minimum age --- config/production.yaml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/production.yaml.example b/config/production.yaml.example index 890ec94b9..282a631f9 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -239,7 +239,7 @@ contact_form: signup: enabled: false limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited - mimimum_age: 16 + minimum_age: 16 requires_email_verification: false filters: cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist -- cgit v1.2.3 From 2d7273168b42a58f12005aad1da5a8215bc111a7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 16 Jul 2021 16:26:20 +0200 Subject: Fix user creation form --- client/src/app/+admin/users/user-edit/user-create.component.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts index da333240c..c26ad1208 100644 --- a/client/src/app/+admin/users/user-edit/user-create.component.ts +++ b/client/src/app/+admin/users/user-edit/user-create.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core' -import { ActivatedRoute, Router } from '@angular/router' +import { Router } from '@angular/router' import { ConfigService } from '@app/+admin/config/shared/config.service' import { AuthService, Notifier, ScreenService, ServerService, UserService } from '@app/core' import { @@ -30,7 +30,6 @@ export class UserCreateComponent extends UserEdit implements OnInit { protected configService: ConfigService, protected screenService: ScreenService, protected auth: AuthService, - private route: ActivatedRoute, private router: Router, private notifier: Notifier, private userService: UserService @@ -87,8 +86,7 @@ export class UserCreateComponent extends UserEdit implements OnInit { } isPasswordOptional () { - const serverConfig = this.route.snapshot.data.serverConfig - return serverConfig.email.enabled + return this.serverConfig.email.enabled } getFormButtonTitle () { -- cgit v1.2.3