From e5a250c565d7c87314e9c76e5d452588ddabf2f2 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 8 Apr 2020 17:05:38 +0100
Subject: [PATCH] Remove P2P demo docker stuff, no longer needed now that we
 have SQLite

---
 docker/p2p-entrypoint.sh    | 29 -------------------
 docker/p2p-riot-config.json | 55 -------------------------------------
 docker/services/p2p-demo.sh |  5 ----
 3 files changed, 89 deletions(-)
 delete mode 100644 docker/p2p-entrypoint.sh
 delete mode 100644 docker/p2p-riot-config.json
 delete mode 100644 docker/services/p2p-demo.sh

diff --git a/docker/p2p-entrypoint.sh b/docker/p2p-entrypoint.sh
deleted file mode 100644
index 59ec1ab78..000000000
--- a/docker/p2p-entrypoint.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Kick off postgres
-export POSTGRES_DB=dendrite
-export POSTGRES_USER=dendrite
-export POSTGRES_PASSWORD=itsasecret
-./usr/local/bin/docker-entrypoint.sh postgres &
-
-# Wait for postgres to be ready
-sleep 5
-while ! pg_isready;
-do
-  sleep 1
-done
-
-# Start nginx
-echo "Starting Riot"
-nginx
-
-echo "Postgres and Riot are now running!"
-echo "Please start Dendrite using:"
-echo ""
-echo "  GO111MODULE=on go get github.com/matrix-org/dendrite-p2p-demo"
-echo "  \`go env GOPATH\`/bin/dendrite-p2p-demo -d 8081"
-echo ""
-echo "https://matrix.org/~matthew/p2p-demo.html"
-
-# Wait forever
-exec tail -f /dev/null
diff --git a/docker/p2p-riot-config.json b/docker/p2p-riot-config.json
deleted file mode 100644
index dba3efcfa..000000000
--- a/docker/p2p-riot-config.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "default_server_config": {
-        "m.homeserver": {
-            "base_url": "http://localhost:8080",
-            "server_name": "p2p"
-        },
-        "m.identity_server": {
-            "base_url": "https://vector.im"
-        }
-    },
-    "disable_custom_urls": false,
-    "disable_guests": true,
-    "disable_login_language_selector": false,
-    "disable_3pid_login": false,
-    "brand": "Riot",
-    "integrations_ui_url": "https://scalar.vector.im/",
-    "integrations_rest_url": "https://scalar.vector.im/api",
-    "integrations_widgets_urls": [
-        "https://scalar.vector.im/_matrix/integrations/v1",
-        "https://scalar.vector.im/api",
-        "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
-    ],
-    "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "defaultCountryCode": "GB",
-    "showLabsSettings": false,
-    "features": {
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs"
-    },
-    "default_federate": true,
-    "default_theme": "light",
-    "roomDirectory": {
-        "servers": [
-        ]
-    },
-    "welcomeUserId": "@riot-bot:matrix.org",
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "whitelistedHSUrls": ["https://matrix.org"],
-        "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
-        "siteId": 1
-    },
-    "enable_presence_by_hs_url": {
-        "https://matrix.org": false,
-        "https://matrix-client.matrix.org": false
-    },
-    "settingDefaults": {
-        "breadcrumbs": true
-    }
-}
diff --git a/docker/services/p2p-demo.sh b/docker/services/p2p-demo.sh
deleted file mode 100644
index 4b44fdf52..000000000
--- a/docker/services/p2p-demo.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-bash ./docker/build.sh
-
-./bin/dendrite-p2p-demo
\ No newline at end of file