From d3e6e2260ebb00ed1bca1687e44748381ecec941 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 2 Jun 2017 22:49:46 +1000
Subject: [PATCH] Updated for docker image defaults

---
 10-default.conf |  5 -----
 11-default.conf | 15 ---------------
 Dockerfile      |  7 +------
 sshd            |  5 ++---
 sshd_config     |  2 +-
 5 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 10-default.conf
 delete mode 100644 11-default.conf

diff --git a/10-default.conf b/10-default.conf
deleted file mode 100644
index 907d1d0..0000000
--- a/10-default.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<Directory /var/www/html>
-	AllowOverride AuthConfig FileInfo Indexes Limit Options
-	Options FollowSymLinks
-	Require all denied
-</Directory>
diff --git a/11-default.conf b/11-default.conf
deleted file mode 100644
index d5e4adc..0000000
--- a/11-default.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
-LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-
-<Directory /var/www/html/public>
-	AllowOverride FileInfo Indexes Options=Multiviews
-	Require all granted
-</Directory>
-
-<VirtualHost *:80>
-	DocumentRoot /var/www/html/public
-
-	ErrorLog /var/log/httpd/0.0.0.0-error_log
-	TransferLog /var/log/httpd/0.0.0.0-access_log
-	CustomLog logs/0.0.0.0-custom_log combined
-</VirtualHost>
diff --git a/Dockerfile b/Dockerfile
index 6adafc7..1713f54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,7 @@
 # NAME leenooks/lamps
 # VERSION php70
 
-FROM registry.leenooks.net/leenooks/base:7
-
-RUN yum -y install epel-release && yum clean all
-
-RUN yum -y install tsmpipe && yum clean all
+FROM registry.leenooks.net/leenooks/base:7.TE
 
 RUN yum -y install http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && yum clean all && rm -rf /var/tmp/*
 
@@ -36,7 +32,6 @@ RUN yum -y install --enabler remi-php70 \
 	&& yum clean all
 
 COPY .my.cnf /root/
-COPY 1?-default.conf /etc/httpd/conf.d/
 COPY sshd /etc/sysconfig/sshd
 COPY sshd_config /etc/ssh/
 RUN ln -f /etc/.ln/httpd/conf.d/awstats.conf /etc/httpd/conf.d/awstats.conf && ln -f /etc/.ln/opendkim.conf /etc/opendkim.conf
diff --git a/sshd b/sshd
index 3edfc47..1a665f4 100644
--- a/sshd
+++ b/sshd
@@ -15,8 +15,7 @@ SSH_USE_STRONG_RNG=0
 # SSH_USE_STRONG_RNG=1
 
 # Override Defaults
-RSA1_KEY=/etc/leenooks/ssh/ssh_host_key
 RSA_KEY=/etc/leenooks/ssh/ssh_host_rsa_key
-DSA_KEY=/etc/leenooks/ssh/ssh_host_dsa_key
 ECDSA_KEY=/etc/leenooks/ssh/ssh_host_ecdsa_key
-ED25519_KEY=/etc/leenooks/ssh/ssh_host_ed25519_key
+
+AUTOCREATE_SERVER_KEYS="RSA ECDSA"
diff --git a/sshd_config b/sshd_config
index fa22ee5..230b740 100644
--- a/sshd_config
+++ b/sshd_config
@@ -28,7 +28,7 @@
 HostKey /etc/leenooks/ssh/ssh_host_rsa_key
 #HostKey /etc/ssh/ssh_host_dsa_key
 HostKey /etc/leenooks/ssh/ssh_host_ecdsa_key
-HostKey /etc/leenooks/ssh/ssh_host_ed25519_key
+#HostKey /etc/leenooks/ssh/ssh_host_ed25519_key
 
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h