diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-13 21:48:55 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-13 21:48:55 +0200 |
commit | 5683534893025b962cfb14fe5c1319b0b278e77d (patch) | |
tree | 511abb0daae58b17c55395a84eb5a80953849e63 | |
parent | 82221ac920ad2e6bafc742a09fa1636899d4173e (diff) | |
download | PeerTube-5683534893025b962cfb14fe5c1319b0b278e77d.tar.gz PeerTube-5683534893025b962cfb14fe5c1319b0b278e77d.tar.zst PeerTube-5683534893025b962cfb14fe5c1319b0b278e77d.zip |
Remove references to Electron
-rw-r--r-- | config/default.yaml | 3 | ||||
-rw-r--r-- | config/test.yaml | 3 | ||||
-rw-r--r-- | server/initializers/checker.js | 4 | ||||
-rw-r--r-- | server/initializers/constants.js | 8 |
4 files changed, 2 insertions, 16 deletions
diff --git a/config/default.yaml b/config/default.yaml index b44be31b0..6a1e22204 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -18,6 +18,3 @@ storage: | |||
18 | logs: 'logs/' | 18 | logs: 'logs/' |
19 | thumbnails: 'thumbnails/' | 19 | thumbnails: 'thumbnails/' |
20 | torrents: 'torrents/' | 20 | torrents: 'torrents/' |
21 | |||
22 | electron: | ||
23 | debug: false | ||
diff --git a/config/test.yaml b/config/test.yaml index 7f893bc4f..8a667a001 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
@@ -7,6 +7,3 @@ webserver: | |||
7 | database: | 7 | database: |
8 | host: 'localhost' | 8 | host: 'localhost' |
9 | port: 27017 | 9 | port: 27017 |
10 | |||
11 | electron: | ||
12 | debug: false | ||
diff --git a/server/initializers/checker.js b/server/initializers/checker.js index 91fbcfaf9..85e9bc98b 100644 --- a/server/initializers/checker.js +++ b/server/initializers/checker.js | |||
@@ -17,8 +17,8 @@ function checkConfig () { | |||
17 | const required = [ 'listen.port', | 17 | const required = [ 'listen.port', |
18 | 'webserver.https', 'webserver.host', 'webserver.port', | 18 | 'webserver.https', 'webserver.host', 'webserver.port', |
19 | 'database.host', 'database.port', 'database.suffix', | 19 | 'database.host', 'database.port', 'database.suffix', |
20 | 'storage.certs', 'storage.uploads', 'storage.logs', 'storage.thumbnails', | 20 | 'storage.certs', 'storage.uploads', 'storage.logs', 'storage.thumbnails' |
21 | 'electron.debug' ] | 21 | ] |
22 | const miss = [] | 22 | const miss = [] |
23 | 23 | ||
24 | for (const key of required) { | 24 | for (const key of required) { |
diff --git a/server/initializers/constants.js b/server/initializers/constants.js index 75065fe72..09c4f755e 100644 --- a/server/initializers/constants.js +++ b/server/initializers/constants.js | |||
@@ -35,9 +35,6 @@ const CONFIG = { | |||
35 | HOST: config.get('database.host'), | 35 | HOST: config.get('database.host'), |
36 | PORT: config.get('database.port') | 36 | PORT: config.get('database.port') |
37 | }, | 37 | }, |
38 | ELECTRON: { | ||
39 | DEBUG: config.get('electron.debug') | ||
40 | }, | ||
41 | STORAGE: { | 38 | STORAGE: { |
42 | CERT_DIR: path.join(__dirname, '..', '..', config.get('storage.certs')), | 39 | CERT_DIR: path.join(__dirname, '..', '..', config.get('storage.certs')), |
43 | LOG_DIR: path.join(__dirname, '..', '..', config.get('storage.logs')), | 40 | LOG_DIR: path.join(__dirname, '..', '..', config.get('storage.logs')), |
@@ -138,10 +135,6 @@ const USER_ROLES = { | |||
138 | USER: 'user' | 135 | USER: 'user' |
139 | } | 136 | } |
140 | 137 | ||
141 | // Seeds in parallel we send to electron when "seed all" | ||
142 | // Once a video is in seeding state we seed another video etc | ||
143 | const SEEDS_IN_PARALLEL = 3 | ||
144 | |||
145 | // --------------------------------------------------------------------------- | 138 | // --------------------------------------------------------------------------- |
146 | 139 | ||
147 | // Special constants for a test instance | 140 | // Special constants for a test instance |
@@ -169,7 +162,6 @@ module.exports = { | |||
169 | REQUESTS_LIMIT, | 162 | REQUESTS_LIMIT, |
170 | RETRY_REQUESTS, | 163 | RETRY_REQUESTS, |
171 | SEARCHABLE_COLUMNS, | 164 | SEARCHABLE_COLUMNS, |
172 | SEEDS_IN_PARALLEL, | ||
173 | SORTABLE_COLUMNS, | 165 | SORTABLE_COLUMNS, |
174 | STATIC_PATHS, | 166 | STATIC_PATHS, |
175 | THUMBNAILS_SIZE, | 167 | THUMBNAILS_SIZE, |