From da8a510371ac63b0626e9e5b6b92df39ad4d9d0e Mon Sep 17 00:00:00 2001
From: ray <gitea@rayelliott.dev>
Date: Mon, 8 Jun 2020 20:20:39 +0100
Subject: [PATCH] combine config files

---
 config-local.sh => config-example.sh | 1 +
 config-remote.sh                     | 8 --------
 server-install-base.sh               | 5 +++++
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename config-local.sh => config-example.sh (94%)
 delete mode 100755 config-remote.sh

diff --git a/config-local.sh b/config-example.sh
similarity index 94%
rename from config-local.sh
rename to config-example.sh
index 758408c..7592e85 100755
--- a/config-local.sh
+++ b/config-example.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 export local_url=''
+export remote_url=''
 
 export username=''
 export webuser=''
diff --git a/config-remote.sh b/config-remote.sh
deleted file mode 100755
index 301e079..0000000
--- a/config-remote.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-export remote_url=''
-
-# Entries below overridfe those in config-local.sh
-# If not set here, those in config-local.sh will be used
-
-
diff --git a/server-install-base.sh b/server-install-base.sh
index 829303e..3372341 100755
--- a/server-install-base.sh
+++ b/server-install-base.sh
@@ -1,3 +1,8 @@
 #!/bin/sh
 
 
+apt upgrade || exit 10
+apt install -y tmux ufw || exit 15
+
+ufw allow ssh || exit 20
+ufw enable