Use a filtered proxy without variables

pull/2427/head
Chocobozzz 2020-01-22 09:24:26 +01:00
parent c76130067c
commit 6848b9f4b2
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 6 additions and 10 deletions

View File

@ -86,9 +86,9 @@ import:
videos:
http:
enabled: true
proxy:
enabled: false
url: ""
proxy:
enabled: false
url: ""
torrent:
enabled: true

View File

@ -9,7 +9,7 @@ fi
killall -q peertube || true
perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "'"$PROXY_URL"'"#' config/test.yaml
perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "https://cpy.re:7899"#' config/test.yaml
if [ "$1" = "misc" ]; then
npm run build -- --light-fr

View File

@ -91,7 +91,7 @@ describe('Test AP refresher', function () {
})
it('Should not update a remote video if the remote instance is down', async function () {
this.timeout(60000)
this.timeout(70000)
killallServers([ servers[ 1 ] ])
@ -106,10 +106,6 @@ describe('Test AP refresher', function () {
await reRunServer(servers[ 1 ])
// Should not refresh the video, even if the last refresh failed (to avoid a loop on dead instances)
await getVideo(servers[ 0 ].url, videoUUID3)
await waitJobs(servers)
await getVideo(servers[ 0 ].url, videoUUID3, 200)
})
})

View File

@ -3,7 +3,7 @@ import { VideoImportCreate } from '../../models/videos'
import { makeGetRequest, makeUploadRequest } from '../requests/requests'
function getYoutubeVideoUrl () {
return 'https://youtu.be/msX3jv1XdvM'
return 'http://www.youtube.com/watch?v=msX3jv1XdvM'
}
function getMagnetURI () {