aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2018-05-15 00:29:40 +0200
committerChocobozzz <me@florianbigard.com>2018-05-16 10:50:55 +0200
commitac235c37e2d7112efbc182e0179cb27e75ef09a1 (patch)
tree1b209b83a399b3d91229f55d74a1e7f414d5e2cb
parent2efd32f697549c59337db5177a93749af8e605d8 (diff)
downloadPeerTube-ac235c37e2d7112efbc182e0179cb27e75ef09a1.tar.gz
PeerTube-ac235c37e2d7112efbc182e0179cb27e75ef09a1.tar.zst
PeerTube-ac235c37e2d7112efbc182e0179cb27e75ef09a1.zip
robots.txt config and route
-rw-r--r--config/default.yaml4
-rw-r--r--config/production.yaml.example4
-rw-r--r--server/controllers/static.ts6
-rw-r--r--server/initializers/checker.ts2
-rw-r--r--server/initializers/constants.ts3
5 files changed, 17 insertions, 2 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 2826e76f8..995638281 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -90,6 +90,10 @@ instance:
90 customizations: 90 customizations:
91 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime 91 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
92 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime 92 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
93 # Robot.txt rules. To allow robots to crawl your instance and allow indexation of your site, remove the '/'
94 robots: |
95 User-agent: *
96 Disallow: /
93 97
94services: 98services:
95 # Cards configuration to format video in Twitter 99 # Cards configuration to format video in Twitter
diff --git a/config/production.yaml.example b/config/production.yaml.example
index a6f1740fe..71344fa35 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -106,6 +106,10 @@ instance:
106 customizations: 106 customizations:
107 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime 107 javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
108 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime 108 css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
109 # Robot.txt rules. To allow robots to crawl your instance and allow indexation of your site, remove the '/'
110 robots: |
111 User-agent: *
112 Disallow: /
109 113
110services: 114services:
111 # Cards configuration to format video in Twitter 115 # Cards configuration to format video in Twitter
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index eece9c06b..c1bf384a4 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -44,6 +44,12 @@ staticRouter.use(
44 asyncMiddleware(getPreview) 44 asyncMiddleware(getPreview)
45) 45)
46 46
47// robots.txt service
48staticRouter.get('/robots.txt', (req: express.Request, res: express.Response) => {
49 res.type('text/plain')
50 return res.send(CONFIG.INSTANCE.ROBOTS)
51})
52
47// --------------------------------------------------------------------------- 53// ---------------------------------------------------------------------------
48 54
49export { 55export {
diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts
index 9bf53e940..c11dc7a89 100644
--- a/server/initializers/checker.ts
+++ b/server/initializers/checker.ts
@@ -29,7 +29,7 @@ function checkMissedConfig () {
29 'user.video_quota', 29 'user.video_quota',
30 'cache.previews.size', 'admin.email', 'signup.enabled', 'signup.limit', 'transcoding.enabled', 'transcoding.threads', 30 'cache.previews.size', 'admin.email', 'signup.enabled', 'signup.limit', 'transcoding.enabled', 'transcoding.threads',
31 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', 31 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route',
32 'instance.default_nsfw_policy', 32 'instance.default_nsfw_policy', 'instance.robots',
33 'services.twitter.username', 'services.twitter.whitelisted' 33 'services.twitter.username', 'services.twitter.whitelisted'
34 ] 34 ]
35 const miss: string[] = [] 35 const miss: string[] = []
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 5a7d91160..51d272895 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -180,7 +180,8 @@ const CONFIG = {
180 CUSTOMIZATIONS: { 180 CUSTOMIZATIONS: {
181 get JAVASCRIPT () { return config.get<string>('instance.customizations.javascript') }, 181 get JAVASCRIPT () { return config.get<string>('instance.customizations.javascript') },
182 get CSS () { return config.get<string>('instance.customizations.css') } 182 get CSS () { return config.get<string>('instance.customizations.css') }
183 } 183 },
184 get ROBOTS () { return config.get<string>('instance.robots') }
184 }, 185 },
185 SERVICES: { 186 SERVICES: {
186 TWITTER: { 187 TWITTER: {