Updated for docker image defaults

This commit is contained in:
Deon George 2017-06-02 22:49:46 +10:00
parent 7e0e3fea0b
commit d3e6e2260e
5 changed files with 4 additions and 30 deletions

View File

@ -1,5 +0,0 @@
<Directory /var/www/html>
AllowOverride AuthConfig FileInfo Indexes Limit Options
Options FollowSymLinks
Require all denied
</Directory>

View File

@ -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>

View File

@ -1,11 +1,7 @@
# NAME leenooks/lamps # NAME leenooks/lamps
# VERSION php70 # VERSION php70
FROM registry.leenooks.net/leenooks/base:7 FROM registry.leenooks.net/leenooks/base:7.TE
RUN yum -y install epel-release && yum clean all
RUN yum -y install tsmpipe && yum clean all
RUN yum -y install http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && yum clean all && rm -rf /var/tmp/* 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 && yum clean all
COPY .my.cnf /root/ COPY .my.cnf /root/
COPY 1?-default.conf /etc/httpd/conf.d/
COPY sshd /etc/sysconfig/sshd COPY sshd /etc/sysconfig/sshd
COPY sshd_config /etc/ssh/ 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 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

5
sshd
View File

@ -15,8 +15,7 @@ SSH_USE_STRONG_RNG=0
# SSH_USE_STRONG_RNG=1 # SSH_USE_STRONG_RNG=1
# Override Defaults # Override Defaults
RSA1_KEY=/etc/leenooks/ssh/ssh_host_key
RSA_KEY=/etc/leenooks/ssh/ssh_host_rsa_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 ECDSA_KEY=/etc/leenooks/ssh/ssh_host_ecdsa_key
ED25519_KEY=/etc/leenooks/ssh/ssh_host_ed25519_key
AUTOCREATE_SERVER_KEYS="RSA ECDSA"

View File

@ -28,7 +28,7 @@
HostKey /etc/leenooks/ssh/ssh_host_rsa_key HostKey /etc/leenooks/ssh/ssh_host_rsa_key
#HostKey /etc/ssh/ssh_host_dsa_key #HostKey /etc/ssh/ssh_host_dsa_key
HostKey /etc/leenooks/ssh/ssh_host_ecdsa_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 # Lifetime and size of ephemeral version 1 server key
#KeyRegenerationInterval 1h #KeyRegenerationInterval 1h