Skip to content

Commit 979e118

Browse files
committed
Added apache setting to Dockerimage
1 parent a75d3b0 commit 979e118

File tree

4 files changed

+52
-2
lines changed

4 files changed

+52
-2
lines changed

.docker/os2web/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,8 @@ RUN echo '<?php $settings["project_env"] = PROD_ENV; ' > /opt/drupal/web/sites/d
4646
chown -R www-data:www-data /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync; \
4747
chmod g+s -R /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync
4848

49+
# Adding custom apache configuration with PHP value and log settings.
50+
COPY apache/000-default.conf /etc/apache2/sites-enabled/000-default.conf
51+
52+
# Adding Drupal settings.
4953
COPY settings/prod.settings.php /opt/drupal/web/sites/default/
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<VirtualHost *:80>
2+
# The ServerName directive sets the request scheme, hostname and port that
3+
# the server uses to identify itself. This is used when creating
4+
# redirection URLs. In the context of virtual hosts, the ServerName
5+
# specifies what hostname must appear in the request's Host: header to
6+
# match this virtual host. For the default virtual host (this file) this
7+
# value is not decisive as it is used as a last resort host regardless.
8+
# However, you must set it for any further virtual host explicitly.
9+
ServerName example.com
10+
11+
ServerAdmin webmaster@localhost
12+
DocumentRoot /var/www/html
13+
14+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
15+
# error, crit, alert, emerg.
16+
# It is also possible to configure the loglevel for particular
17+
# modules, e.g.
18+
#LogLevel info ssl:warn
19+
20+
ErrorLog ${APACHE_LOG_DIR}/error.log
21+
CustomLog ${APACHE_LOG_DIR}/access.log combined
22+
23+
php_admin_value open_basedir /var/www/html:/usr/share/php
24+
php_value include_path .:/var/www/html
25+
26+
php_value log_errors 1
27+
php_value html_errors 0
28+
php_value display_errors 0
29+
php_admin_value error_reporting 1023
30+
php_value error_log /opt/drupal/logs/php.log
31+
32+
php_value session.save_path /opt/drupal/sessions
33+
php_admin_value upload_max_filesize 150
34+
php_admin_value upload_tmp_dir /tmp
35+
36+
# For most configuration files from conf-available/, which are
37+
# enabled or disabled at a global level, it is possible to
38+
# include a line for only one particular virtual host. For example the
39+
# following line enables the CGI configuration for this host only
40+
# after it has been globally disabled with "a2disconf".
41+
#Include conf-available/serve-cgi-bin.conf
42+
</VirtualHost>
43+
44+
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
45+

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@
4545
*.sql
4646
*.sql.gz
4747

48-
# docker/docksal
49-
logs/*.log
48+
logs/*
5049
!logs/.gitkeep
50+
sessions/*
51+
!sessions/.gitkeep
5152

5253
.docker/logs/*
5354
!.docker/logs/.gitkeep

sessions/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)