From 1eb6d14298dbcc6b26200420c9ffa84a252ef9df Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Thu, 18 Jan 2018 00:01:34 -0800 Subject: [PATCH 1/4] Added more metatarsi + screenshot --- server/pages/components/Layout.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/server/pages/components/Layout.js b/server/pages/components/Layout.js index 02c40de7a..d492b67a4 100644 --- a/server/pages/components/Layout.js +++ b/server/pages/components/Layout.js @@ -6,6 +6,11 @@ import Analytics from '../../../shared/components/Analytics'; import globalStyles from '../../../shared/styles/globals'; import { color } from '../../../shared/styles/constants'; +export const title = 'Outline'; +export const description = + 'Your team’s knowledge base - Team wiki, documentation, playbooks, onboarding & more…'; +export const screenshotUrl = 'https://www.getoutline.com/screenshot.png'; + type Props = { children?: React$Element<*>, }; @@ -17,16 +22,25 @@ export default function Layout({ children }: Props) { - Outline + {title} - - + + + + + + + + + + + + + + Date: Sun, 21 Jan 2018 18:46:55 -0800 Subject: [PATCH 2/4] Default deployment should be self --- .env.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 5b27a8e5d..27f6967bb 100644 --- a/.env.sample +++ b/.env.sample @@ -10,7 +10,7 @@ SECRET_KEY=F0E5AD933D7F6FD8F4DBB3E038C501C052DC0593C686D21ACB30AE205D2F634B PORT=3000 REDIS_URL=redis://redis:6379 URL=http://localhost:3000 -DEPLOYMENT=hosted +DEPLOYMENT=self ENABLE_UPDATES=true DEBUG=sql,cache,presenters,events From 1b5513be0cc853d83e05dd99f64f5820b34c1207 Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Sun, 21 Jan 2018 18:47:13 -0800 Subject: [PATCH 3/4] Use URL env --- server/pages/components/Layout.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/pages/components/Layout.js b/server/pages/components/Layout.js index d492b67a4..d962aa409 100644 --- a/server/pages/components/Layout.js +++ b/server/pages/components/Layout.js @@ -9,7 +9,7 @@ import { color } from '../../../shared/styles/constants'; export const title = 'Outline'; export const description = 'Your team’s knowledge base - Team wiki, documentation, playbooks, onboarding & more…'; -export const screenshotUrl = 'https://www.getoutline.com/screenshot.png'; +export const screenshotUrl = `${process.env.URL}/screenshot.png`; type Props = { children?: React$Element<*>, @@ -39,7 +39,7 @@ export default function Layout({ children }: Props) { - + Date: Sun, 21 Jan 2018 18:47:43 -0800 Subject: [PATCH 4/4] disallow robots index for self hosted deployments --- server/routes.js | 4 ++++ server/utils/robots.js | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 server/utils/robots.js diff --git a/server/routes.js b/server/routes.js index ece6031c4..86e968f0c 100644 --- a/server/routes.js +++ b/server/routes.js @@ -10,6 +10,7 @@ import serve from 'koa-static'; import subdomainRedirect from './middlewares/subdomainRedirect'; import renderpage from './utils/renderpage'; import { slackAuth } from '../shared/utils/routeHelpers'; +import { robotsResponse } from './utils/robots'; import Home from './pages/Home'; import About from './pages/About'; @@ -81,6 +82,9 @@ router.get('/', async ctx => { } }); +// Other +router.get('/robots.txt', ctx => (ctx.body = robotsResponse(ctx))); + // catch all for react app router.get('*', async ctx => { await renderapp(ctx); diff --git a/server/utils/robots.js b/server/utils/robots.js new file mode 100644 index 000000000..f7e08c8ee --- /dev/null +++ b/server/utils/robots.js @@ -0,0 +1,9 @@ +// @flow +import { type Context } from 'koa'; + +const DISALLOW_ROBOTS = `User-agent: * +Disallow: /`; + +export const robotsResponse = (ctx: Context): ?string => { + if (ctx.headers.host.indexOf('getoutline.com') < 0) return DISALLOW_ROBOTS; +};