aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-02-17 10:28:33 +0100
committerChocobozzz <me@florianbigard.com>2023-02-17 10:28:33 +0100
commitefaf3797897533ebaac6d96110c4c56af9fc1628 (patch)
treefc050302e7104a76e4eb620415dc91e7f122e876
parent03902b00994a03e333acd7662d26782e3dc52e07 (diff)
downloadPeerTube-efaf3797897533ebaac6d96110c4c56af9fc1628.tar.gz
PeerTube-efaf3797897533ebaac6d96110c4c56af9fc1628.tar.zst
PeerTube-efaf3797897533ebaac6d96110c4c56af9fc1628.zip
Fix dev instance following test instances
-rw-r--r--.github/CONTRIBUTING.md2
-rw-r--r--server/helpers/custom-validators/activitypub/misc.ts2
-rw-r--r--server/helpers/custom-validators/servers.ts2
-rw-r--r--server/models/actor/sql/shared/actor-follow-table-attributes.ts3
4 files changed, 3 insertions, 6 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 43b93daec..e635969ad 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -228,7 +228,7 @@ $ NODE_APP_INSTANCE=2 NODE_ENV=test npm start
228$ NODE_APP_INSTANCE=3 NODE_ENV=test npm start 228$ NODE_APP_INSTANCE=3 NODE_ENV=test npm start
229``` 229```
230 230
231Then you will get access to the three nodes at `http://localhost:900{1,2,3}` 231Then you will get access to the three nodes at `http://127.0.0.1:900{1,2,3}`
232with the `root` as username and `test{1,2,3}` for the password. 232with the `root` as username and `test{1,2,3}` for the password.
233 233
234Instance configurations are in `config/test-{1,2,3}.yaml`. 234Instance configurations are in `config/test-{1,2,3}.yaml`.
diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts
index 4619f0eb5..279ad83dc 100644
--- a/server/helpers/custom-validators/activitypub/misc.ts
+++ b/server/helpers/custom-validators/activitypub/misc.ts
@@ -13,7 +13,7 @@ function isUrlValid (url: string) {
13 } 13 }
14 14
15 // We validate 'localhost', so we don't have the top level domain 15 // We validate 'localhost', so we don't have the top level domain
16 if (CONFIG.WEBSERVER.HOSTNAME === 'localhost') { 16 if (CONFIG.WEBSERVER.HOSTNAME === 'localhost' || CONFIG.WEBSERVER.HOSTNAME === '127.0.0.1') {
17 isURLOptions.require_tld = false 17 isURLOptions.require_tld = false
18 } 18 }
19 19
diff --git a/server/helpers/custom-validators/servers.ts b/server/helpers/custom-validators/servers.ts
index 94fda05aa..b2aa03b77 100644
--- a/server/helpers/custom-validators/servers.ts
+++ b/server/helpers/custom-validators/servers.ts
@@ -10,7 +10,7 @@ function isHostValid (host: string) {
10 } 10 }
11 11
12 // We validate 'localhost', so we don't have the top level domain 12 // We validate 'localhost', so we don't have the top level domain
13 if (CONFIG.WEBSERVER.HOSTNAME === 'localhost') { 13 if (CONFIG.WEBSERVER.HOSTNAME === 'localhost' || CONFIG.WEBSERVER.HOSTNAME === '127.0.0.1') {
14 isURLOptions.require_tld = false 14 isURLOptions.require_tld = false
15 } 15 }
16 16
diff --git a/server/models/actor/sql/shared/actor-follow-table-attributes.ts b/server/models/actor/sql/shared/actor-follow-table-attributes.ts
index 7dd908ece..4431aa6d1 100644
--- a/server/models/actor/sql/shared/actor-follow-table-attributes.ts
+++ b/server/models/actor/sql/shared/actor-follow-table-attributes.ts
@@ -1,4 +1,3 @@
1import { logger } from '@server/helpers/logger'
2import { Memoize } from '@server/helpers/memoize' 1import { Memoize } from '@server/helpers/memoize'
3import { ServerModel } from '@server/models/server/server' 2import { ServerModel } from '@server/models/server/server'
4import { ActorModel } from '../../actor' 3import { ActorModel } from '../../actor'
@@ -9,8 +8,6 @@ export class ActorFollowTableAttributes {
9 8
10 @Memoize() 9 @Memoize()
11 getFollowAttributes () { 10 getFollowAttributes () {
12 logger.error('coucou')
13
14 return ActorFollowModel.getSQLAttributes('ActorFollowModel').join(', ') 11 return ActorFollowModel.getSQLAttributes('ActorFollowModel').join(', ')
15 } 12 }
16 13