From 84a9209ba7294243e5bbefede46a3dee7994da9b Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Sun, 4 Feb 2018 15:08:43 +0100
Subject: [PATCH] Remove etc/service files from rob's branch

---
 contrib/docker/rob/docker-compose.yaml        | 39 ----------
 .../rob/rootfs/etc/service/synapse/finish     | 17 -----
 .../docker/rob/rootfs/etc/service/synapse/run | 75 -------------------
 3 files changed, 131 deletions(-)
 delete mode 100644 contrib/docker/rob/docker-compose.yaml
 delete mode 100755 contrib/docker/rob/rootfs/etc/service/synapse/finish
 delete mode 100755 contrib/docker/rob/rootfs/etc/service/synapse/run

diff --git a/contrib/docker/rob/docker-compose.yaml b/contrib/docker/rob/docker-compose.yaml
deleted file mode 100644
index 73cc29f8fd..0000000000
--- a/contrib/docker/rob/docker-compose.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2017 Vector Creations Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-version: '3'
-
-services:
-    postgres:
-        image: postgres:9.6.5-alpine
-        environment:
-            POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-            POSTGRES_DB: synapse
-        expose:
-            - 5432
-        restart: unless-stopped
-        volumes:
-            - postgres-data:/var/lib/postgresql/data/
-
-    synapse:
-        image: matrixdotorg/synapse:v0.22.1
-        ports:
-            - 8008:8008
-            - 8448:8448
-        restart: unless-stopped
-        volumes:
-            - ${CONFIG_PATH}:/synapse/config/
-
-volumes:
-    postgres-data:
diff --git a/contrib/docker/rob/rootfs/etc/service/synapse/finish b/contrib/docker/rob/rootfs/etc/service/synapse/finish
deleted file mode 100755
index 2aace581a1..0000000000
--- a/contrib/docker/rob/rootfs/etc/service/synapse/finish
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2017 Vector Creations Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-kill -TERM 1
diff --git a/contrib/docker/rob/rootfs/etc/service/synapse/run b/contrib/docker/rob/rootfs/etc/service/synapse/run
deleted file mode 100755
index dd797d3ef9..0000000000
--- a/contrib/docker/rob/rootfs/etc/service/synapse/run
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2017 Vector Creations Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-: ${CONFIG_PATH:="/synapse/config"}
-: ${POSTGRES_DATABASE:="synapse"}
-: ${POSTGRES_HOST:="postgres"}
-: ${POSTGRES_USER:="postgres"}
-: ${REPORT_STATS:="yes"}
-: ${SERVER_NAME:="localhost"}
-
-DATABASE_CONFIG_PATH="${CONFIG_PATH}/database.yaml"
-HOMESERVER_CONFIG_PATH="${CONFIG_PATH}/homeserver.yaml"
-SYNAPSE_COMMAND="python -m synapse.app.homeserver"
-
-. /synapse/bin/activate
-cd /synapse
-
-if [[ -n "${GENERATE_CONFIG}" ]]; then
-    ${SYNAPSE_COMMAND} \
-        --server-name ${SERVER_NAME} \
-        --config-path ${HOMESERVER_CONFIG_PATH} \
-        --generate-config \
-        --report-stats=${REPORT_STATS}
-
-    if [[ -f "${DATABASE_CONFIG_PATH}" ]]; then
-        echo "Config file '${DATABASE_CONFIG_PATH}' already exists. Remove it if you want it to be generated."
-    else
-        echo "Generating ${DATABASE_CONFIG_PATH}..."
-        if [[ -n "${POSTGRES_PASSWORD}" ]]; then
-            (cat > ${DATABASE_CONFIG_PATH}) <<EOF
-database:
-  name: psycopg2
-  args:
-    host: ${POSTGRES_HOST}
-    user: ${POSTGRES_USER}
-    password: ${POSTGRES_PASSWORD}
-    database: ${POSTGRES_DATABASE}
-    cp_min: 5
-    cp_max: 10
-EOF
-        else
-            (cat > ${DATABASE_CONFIG_PATH}) <<EOF
-database:
-  name: "sqlite3"
-  args:
-    database: "/synapse/data/homeserver.db"
-EOF
-        fi
-        cat ${DATABASE_CONFIG_PATH} | grep -v password
-    fi
-
-    exit 0
-fi
-
-COMMAND="${SYNAPSE_COMMAND} --config-path ${HOMESERVER_CONFIG_PATH}"
-if [[ -r "${DATABASE_CONFIG_PATH}" ]]; then
-    COMMAND="${COMMAND} --config-path ${DATABASE_CONFIG_PATH}"
-fi
-
-exec ${COMMAND}