From 2a93282a0e1d65c89c67e13998b7490599cbdf2e Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 31 Aug 2017 11:21:33 +0200
Subject: [PATCH] Install postgres-contrib (required by pandora) Do not remove
 gnupg (required by apt-add-key) Cleanup git files in 99-cleanup.sh

---
 01-basic.sh   | 4 ++--
 99-cleanup.sh | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/01-basic.sh b/01-basic.sh
index 33eb1b2..80fc265 100644
--- a/01-basic.sh
+++ b/01-basic.sh
@@ -3,7 +3,7 @@
 SOURCE_DIR=$(realpath $(dirname "${0}"))
 
 # Uninstall unnecessary packages
-apt-get -y purge bsdmainutils dictionaries-common emacsen-common gnupg gnupg-agent iamerican ibritish ienglish-common installation-report ispell laptop-detect nano os-prober pinentry-curses task-english tasksel tasksel-data wamerican
+apt-get -y purge bsdmainutils dictionaries-common emacsen-common iamerican ibritish ienglish-common installation-report ispell laptop-detect nano os-prober pinentry-curses task-english tasksel tasksel-data wamerican
 
 # Install useful packages
 apt-get -y update
@@ -83,7 +83,7 @@ systemctl restart nginx
 #####
 
 # Install packages
-apt-get -y --no-install-recommends -y install postgresql-9.6 postgresql-9.6-postgis
+apt-get -y --no-install-recommends -y install postgresql-9.6 postgresql-9.6-postgis postgresql-contrib-9.6
 
 # Configure
 cp ${SOURCE_DIR}/basic/etc/postgresql/9.6/main/postgresql.conf /etc/postgresql/9.6/main/postgresql.conf
diff --git a/99-cleanup.sh b/99-cleanup.sh
index 5a29b6c..413cf7c 100644
--- a/99-cleanup.sh
+++ b/99-cleanup.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
 
+# Remove git metadata
+find / -name '.git*' -exec rm -rf {} \;
+
+# Remove SSH settings
+rm -rf /root/.ssh/
+
 # Remove packages not necessary for release
 apt-get -y purge git openssh-server
 apt-get -y --purge autoremove
 
 # Clean package cache
 apt-get -y clean
-
-# Remove SSH settings
-rm -rf /root/.ssh/