remove httpd config
This commit is contained in:
parent
8c050fe8af
commit
c0bf5e06cc
14
Dockerfile
14
Dockerfile
|
@ -1,11 +1,21 @@
|
||||||
FROM nextcloud:22.1.0-apache
|
FROM nextcloud:22.1.0-apache
|
||||||
|
|
||||||
COPY httpd/000-default.conf /etc/apache2/sites-available/000-default.conf
|
|
||||||
COPY supervisord/supervisord.conf /opt/supervisord.conf
|
COPY supervisord/supervisord.conf /opt/supervisord.conf
|
||||||
|
|
||||||
# install cron
|
# install cron
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y supervisor libmagickcore-6.q16-6-extra \
|
&& apt-get install -y --no-install-recommends \
|
||||||
|
ffmpeg \
|
||||||
|
libmagickcore-6.q16-6-extra \
|
||||||
|
procps \
|
||||||
|
smbclient \
|
||||||
|
supervisor \
|
||||||
|
libbz2-dev \
|
||||||
|
libc-client-dev \
|
||||||
|
libkrb5-dev \
|
||||||
|
libsmbclient-dev \
|
||||||
|
&& pecl install smbclient \
|
||||||
|
&& docker-php-ext-enable smbclient \
|
||||||
&& mkdir /var/log/supervisord /var/run/supervisord \
|
&& mkdir /var/log/supervisord /var/run/supervisord \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
<VirtualHost *:80>
|
|
||||||
# The ServerName directive sets the request scheme, hostname and port that
|
|
||||||
# the server uses to identify itself. This is used when creating
|
|
||||||
# redirection URLs. In the context of virtual hosts, the ServerName
|
|
||||||
# specifies what hostname must appear in the request's Host: header to
|
|
||||||
# match this virtual host. For the default virtual host (this file) this
|
|
||||||
# value is not decisive as it is used as a last resort host regardless.
|
|
||||||
# However, you must set it for any further virtual host explicitly.
|
|
||||||
#ServerName www.example.com
|
|
||||||
|
|
||||||
ServerAdmin webmaster@localhost
|
|
||||||
DocumentRoot /var/www/html
|
|
||||||
|
|
||||||
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
|
|
||||||
# error, crit, alert, emerg.
|
|
||||||
# It is also possible to configure the loglevel for particular
|
|
||||||
# modules, e.g.
|
|
||||||
#LogLevel info ssl:warn
|
|
||||||
|
|
||||||
ErrorLog ${APACHE_LOG_DIR}/error.log
|
|
||||||
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
|
||||||
|
|
||||||
# For most configuration files from conf-available/, which are
|
|
||||||
# enabled or disabled at a global level, it is possible to
|
|
||||||
# include a line for only one particular virtual host. For example the
|
|
||||||
# following line enables the CGI configuration for this host only
|
|
||||||
# after it has been globally disabled with "a2disconf".
|
|
||||||
#Include conf-available/serve-cgi-bin.conf
|
|
||||||
|
|
||||||
<IfModule mod_rewrite.c>
|
|
||||||
RewriteEngine on
|
|
||||||
RewriteRule ^\.well-known/carddav /nextcloud/remote.php/dav [R=301,L]
|
|
||||||
RewriteRule ^\.well-known/caldav /nextcloud/remote.php/dav [R=301,L]
|
|
||||||
</IfModule>
|
|
||||||
</VirtualHost>
|
|
||||||
|
|
||||||
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
|
Reference in New Issue