Compare commits

...

29 Commits

Author SHA1 Message Date
Markus Opolka
5150ab73cf Upgrading to Version 5.6.12+230327 2023-03-29 18:50:47 +02:00
Markus Opolka
2bf13290c7 Upgrading to LTS Version 3.28.54+230321 2023-03-29 18:48:39 +02:00
Markus Opolka
6014fc72df Upgrading to Version 5.6.10+230313 2023-03-21 14:32:35 +01:00
Markus Opolka
25ab1cb849 Upgrading to LTS Version 3.28.53+230314 2023-03-21 14:31:33 +01:00
Markus Opolka
d777bfc285 Updat nginx.conf example 2023-03-20 15:01:06 +01:00
Markus Opolka
2498c148e3 Merge pull request #137 from martialblog/docs/apache-proxy
Add docker-compose example with Apache reverse-proxy
2023-03-16 16:28:48 +01:00
Markus Opolka
c1e931ee8f Update Traefik Examples
Acked-by: Markus Opolka <markus.opolka@netways.de>
2023-03-16 16:23:31 +01:00
Markus Opolka
e694afe33e Add docker-compose example with Apache reverse-proxy 2023-03-16 15:34:59 +01:00
Markus Opolka
8ecd8012c5 Upgrading to Version 5.6.9+230306 2023-03-14 08:34:42 +01:00
Markus Opolka
e3671f0dc2 Upgrading to LTS Version 3.28.52+230307 2023-03-14 08:34:13 +01:00
Markus Opolka
8d77a697df Upgrading to Version 5.6.8+230227 2023-03-06 20:00:13 +01:00
Markus Opolka
8e78295423 Upgrading to LTS Version 3.28.51+230228 2023-03-06 19:59:33 +01:00
Markus Opolka
1bbcede235 Upgrading to Version 5.6.7+230222 2023-03-01 08:38:59 +01:00
Markus Opolka
2fb47a0151 Upgrading to LTS Version 3.28.50+230221 2023-03-01 08:38:27 +01:00
Markus Opolka
827fb0f6e0 Upgrading to Version 5.6.6+230220 2023-02-21 17:10:43 +01:00
Markus Opolka
32bd800846 Upgrading to LTS Version 3.28.49+230215 2023-02-21 17:10:18 +01:00
Markus Opolka
6709d9964f Upgrading to Version 5.6.4+230206 2023-02-14 12:48:11 +01:00
Markus Opolka
24c3f9fcd2 Upgrading to LTS Version 3.28.48+230207 2023-02-14 12:47:30 +01:00
Markus Opolka
f80cd5ce70 Upgrading to Version 5.6.3+230130 2023-02-06 16:35:45 +01:00
Markus Opolka
dae147ad6f Upgrading to LTS Version 3.28.47+230131 2023-02-06 16:35:15 +01:00
Markus Opolka
ae6de116f2 Upgrading to Version 5.6.2+230125 2023-01-31 19:08:54 +01:00
Markus Opolka
8b2b966ab2 Upgrading to LTS Version 3.28.46+230124 2023-01-31 19:08:14 +01:00
Markus Opolka
b2425303f6 Upgrading to Version 5.6.1+230123 2023-01-25 08:07:46 +01:00
Markus Opolka
ccb8047f80 Upgrading to Version 5.6.0+230116 2023-01-24 09:08:00 +01:00
Markus Opolka
66b6a31821 Upgrading to LTS Version 3.28.45+230117 2023-01-24 09:07:35 +01:00
Markus Opolka
bd81c0b44a Upgrading to Version 5.5.2+230109 2023-01-16 15:04:50 +01:00
Markus Opolka
59986c3205 Upgrading to LTS Version 3.28.44+230110 2023-01-16 15:04:28 +01:00
Markus Opolka
269774947b Upgrading to Version 5.5.1+230103 2023-01-10 08:06:09 +01:00
Markus Opolka
64f001f58c Upgrading to LTS Version 3.28.43+221221 2023-01-10 08:05:37 +01:00
13 changed files with 231 additions and 13 deletions

View File

@@ -59,8 +59,8 @@ RUN a2enmod headers rewrite remoteip; \
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
ARG version="3.28.41+221206"
ARG sha256_checksum="a58300e294cb435abce7d491c888d15ba14160e441547d2f334ca623d38d2358"
ARG version="3.28.54+230321"
ARG sha256_checksum="0baad09c5f6bcbadfea6f5d0d81e43de5c7067141b5a99e1c0afbb6dbd692983"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=root
ARG LISTEN_PORT=80

View File

@@ -33,8 +33,8 @@ RUN set -ex; \
tidy \
zip
ARG version="3.28.41+221206"
ARG sha256_checksum="a58300e294cb435abce7d491c888d15ba14160e441547d2f334ca623d38d2358"
ARG version="3.28.54+230321"
ARG sha256_checksum="0baad09c5f6bcbadfea6f5d0d81e43de5c7067141b5a99e1c0afbb6dbd692983"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ENV LIMESURVEY_VERSION=$version

View File

@@ -46,8 +46,8 @@ RUN set -ex; \
tidy \
zip
ARG version="3.28.41+221206"
ARG sha256_checksum="a58300e294cb435abce7d491c888d15ba14160e441547d2f334ca623d38d2358"
ARG version="3.28.54+230321"
ARG sha256_checksum="0baad09c5f6bcbadfea6f5d0d81e43de5c7067141b5a99e1c0afbb6dbd692983"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ENV LIMESURVEY_VERSION=$version

View File

@@ -60,8 +60,8 @@ RUN a2enmod headers rewrite remoteip; \
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
ARG version="5.5.0+221219"
ARG sha256_checksum="7ce6c8526183840214d834e6a86daa67499f2ecca1edf4e8ecaf0e35eb7f090d"
ARG version="5.6.12+230327"
ARG sha256_checksum="35e1fe11b043a02b5197cf2b0297f456f2f4b4f254ebc1b7070e88bf0b06ba48"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ARG LISTEN_PORT=8080

View File

@@ -34,8 +34,8 @@ RUN set -ex; \
tidy \
zip
ARG version="5.5.0+221219"
ARG sha256_checksum="7ce6c8526183840214d834e6a86daa67499f2ecca1edf4e8ecaf0e35eb7f090d"
ARG version="5.6.12+230327"
ARG sha256_checksum="35e1fe11b043a02b5197cf2b0297f456f2f4b4f254ebc1b7070e88bf0b06ba48"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ENV LIMESURVEY_VERSION=$version

View File

@@ -46,8 +46,8 @@ RUN set -ex; \
tidy \
zip
ARG version="5.5.0+221219"
ARG sha256_checksum="7ce6c8526183840214d834e6a86daa67499f2ecca1edf4e8ecaf0e35eb7f090d"
ARG version="5.6.12+230327"
ARG sha256_checksum="35e1fe11b043a02b5197cf2b0297f456f2f4b4f254ebc1b7070e88bf0b06ba48"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ENV LIMESURVEY_VERSION=$version

View File

@@ -85,6 +85,12 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
# Reverse Proxy configuration
If you are running LimeSurvey behind a Reverse Proxy you might need some additional configuration in the Proxy. For example:
* Apache: `ProxyPreserveHost On`
* Nginx: `fastcgi_param HTTP_HOST my-survey.example.local;`
* Traefik: Set the Host Header explicitly via a customRequestHeaders
## Traefik example
**Hint**: if you want to deploy LimeSurvey on a sub-path (e.g. https://example.com/limesurvey) you have to set the BASE_URL and adjust the Containers Webservers. See the docker-compose Traefik example in the repository.

29
docker-compose.apache.yml Normal file
View File

@@ -0,0 +1,29 @@
version: "3.0"
services:
limesurvey:
image: docker.io/martialblog/limesurvey:3-apache
links:
- lime-db
depends_on:
- lime-db
environment:
- "DB_HOST=lime-db"
- "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar"
- "PUBLIC_URL=http://my.survey.localhost:8080" # Example, Change this
- "BASE_URL=http://my.survey.localhost:8080" # Example, Change this
proxy:
image: docker.io/httpd:bullseye
volumes:
- "./examples/apache-httpd.conf:/usr/local/apache2/conf/httpd.conf:ro"
- "./examples/apache-reverse-proxy.conf:/usr/local/apache2/conf/reverse-proxy.conf:ro"
ports:
- "8080:8080"
lime-db:
image: docker.io/mysql:5.7
environment:
- "MYSQL_USER=limesurvey"
- "MYSQL_DATABASE=limesurvey"
- "MYSQL_PASSWORD=secret"
- "MYSQL_ROOT_PASSWORD=secret"

View File

@@ -0,0 +1,42 @@
version: "3.0"
services:
limesurvey:
build:
context: 5.0/apache/
dockerfile: Dockerfile
labels:
traefik.enable: 'true'
traefik.http.routers.limesurvey-http-router.entrypoints: "http"
traefik.http.routers.limesurvey-http-router.rule: "Host(`my.survey.localhost`)"
traefik.http.services.limesurvey-service.loadbalancer.server.port: "8080"
links:
- lime-db
depends_on:
- lime-db
environment:
- "DB_HOST=lime-db"
- "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar"
- "PUBLIC_URL=http://my.survey.localhost:8888"
- "BASE_URL=http://my.survey.localhost:8888"
traefik:
image: docker.io/traefik:v2.9
container_name: "traefik"
command:
- "--api.insecure=true"
- "--providers.docker=true"
- "--providers.docker.exposedbydefault=false"
- "--entrypoints.http.address=:8888"
ports:
- "8888:8888"
- "8080:8080"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock:ro"
lime-db:
image: docker.io/mysql:5.7
environment:
- "MYSQL_USER=limesurvey"
- "MYSQL_DATABASE=limesurvey"
- "MYSQL_PASSWORD=secret"
- "MYSQL_ROOT_PASSWORD=secret"

View File

@@ -24,7 +24,7 @@ services:
- "PUBLIC_URL=http://localhost:8888/limesurvey"
- "BASE_URL=http://localhost:8888/limesurvey"
traefik:
image: docker.io/traefik:v2.5
image: docker.io/traefik:v2.9
container_name: "traefik"
command:
- "--api.insecure=true"

131
examples/apache-httpd.conf Normal file
View File

@@ -0,0 +1,131 @@
ServerRoot "/usr/local/apache2"
Listen 8080
LoadModule mpm_event_module modules/mod_mpm_event.so
LoadModule authn_file_module modules/mod_authn_file.so
LoadModule authn_core_module modules/mod_authn_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
LoadModule authz_user_module modules/mod_authz_user.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule auth_basic_module modules/mod_auth_basic.so
LoadModule watchdog_module modules/mod_watchdog.so
LoadModule reqtimeout_module modules/mod_reqtimeout.so
LoadModule filter_module modules/mod_filter.so
LoadModule mime_module modules/mod_mime.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule env_module modules/mod_env.so
LoadModule headers_module modules/mod_headers.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule version_module modules/mod_version.so
LoadModule proxy_module modules/mod_proxy.so
LoadModule proxy_connect_module modules/mod_proxy_connect.so
LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
LoadModule proxy_http_module modules/mod_proxy_http.so
LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
LoadModule proxy_express_module modules/mod_proxy_express.so
LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
LoadModule ssl_module modules/mod_ssl.so
LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
LoadModule unixd_module modules/mod_unixd.so
LoadModule status_module modules/mod_status.so
LoadModule autoindex_module modules/mod_autoindex.so
#LoadModule suexec_module modules/mod_suexec.so
<IfModule !mpm_prefork_module>
</IfModule>
<IfModule mpm_prefork_module>
</IfModule>
LoadModule dir_module modules/mod_dir.so
LoadModule alias_module modules/mod_alias.so
<IfModule unixd_module>
User daemon
Group daemon
</IfModule>
ServerAdmin you@example.com
#
<Directory />
AllowOverride none
Require all denied
</Directory>
DocumentRoot "/usr/local/apache2/htdocs"
<Directory "/usr/local/apache2/htdocs">
Options Indexes FollowSymLinks
AllowOverride None
Require all granted
</Directory>
<IfModule dir_module>
DirectoryIndex index.html
</IfModule>
<Files ".ht*">
Require all denied
</Files>
ErrorLog /proc/self/fd/2
LogLevel warn
<IfModule log_config_module>
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
<IfModule logio_module>
# You need to enable mod_logio.c to use %I and %O
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
</IfModule>
CustomLog /proc/self/fd/1 common
</IfModule>
<IfModule alias_module>
ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
</IfModule>
<IfModule cgid_module>
</IfModule>
<Directory "/usr/local/apache2/cgi-bin">
AllowOverride None
Options None
Require all granted
</Directory>
<IfModule headers_module>
RequestHeader unset Proxy early
</IfModule>
<IfModule mime_module>
TypesConfig conf/mime.types
AddType application/x-compress .Z
AddType application/x-gzip .gz .tgz
</IfModule>
# Configure mod_proxy_html to understand HTML4/XHTML1
<IfModule proxy_html_module>
Include conf/extra/proxy-html.conf
</IfModule>
<IfModule ssl_module>
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
</IfModule>
IncludeOptional conf/reverse-proxy.conf

View File

@@ -0,0 +1,8 @@
<VirtualHost *:8080>
ServerAdmin admin@localhost.local
ServerName my.survey.localhost
ProxyPass / http://limesurvey:80/
ProxyPassReverse / http://limesurvey:80/
ProxyPreserveHost On
</VirtualHost>

View File

@@ -33,6 +33,8 @@ http {
fastcgi_pass limesurvey:9000;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
# For Subdomains like https://survey.example.com
# fastcgi_param HTTP_HOST survey.example.com;
}
}
}