Skip to content

Commit

Permalink
Version 2.67
Browse files Browse the repository at this point in the history
  • Loading branch information
crramirez committed Jul 18, 2017
1 parent 485fd2f commit 86f06f2
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 111 deletions.
80 changes: 40 additions & 40 deletions apache_default
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
Listen 8080
<VirtualHost *:*>
ServerAdmin webmaster@localhost

Alias /${HTTP_LOCATION} /var/www/html
DocumentRoot /var/www/html
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/html>
Options Indexes FollowSymLinks MultiViews
# To make wordpress .htaccess work
AllowOverride All
Order allow,deny
allow from all
</Directory>

ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
<Directory "/usr/lib/cgi-bin">
AllowOverride None
Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
Order allow,deny
Allow from all
</Directory>

ErrorLog ${APACHE_LOG_DIR}/error.log

# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn

CustomLog ${APACHE_LOG_DIR}/access.log combined

#
# Set HTTPS environment variable if we came in over secure
# channel.
SetEnvIf x-forwarded-proto https HTTPS=on

</VirtualHost>
Listen 8080
<VirtualHost *:*>
ServerAdmin webmaster@localhost
Alias /${HTTP_LOCATION} /var/www/html
DocumentRoot /var/www/html
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/html>
Options Indexes FollowSymLinks MultiViews
# To make wordpress .htaccess work
AllowOverride All
Order allow,deny
allow from all
</Directory>
ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
<Directory "/usr/lib/cgi-bin">
AllowOverride None
Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
Order allow,deny
Allow from all
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/access.log combined
#
# Set HTTPS environment variable if we came in over secure
# channel.
SetEnvIf x-forwarded-proto https HTTPS=on
</VirtualHost>
56 changes: 28 additions & 28 deletions docker-compose.mysql.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
version: '2'

services:
mysql:
image: mysql:latest
volumes:
- mysql:/var/lib/mysql
restart: always
environment:
MYSQL_ROOT_PASSWORD: limesurvey

limesurvey:
links:
- mysql

environment:
- "DISABLE_MYSQL=yes"

ports:
- "80:80"
volumes:
- upload:/app/upload
image:
crramirez/limesurvey:latest

volumes:
mysql:
upload:
version: '2'

services:
mysql:
image: mysql:latest
volumes:
- mysql:/var/lib/mysql
restart: always
environment:
MYSQL_ROOT_PASSWORD: limesurvey

limesurvey:
links:
- mysql

environment:
- "DISABLE_MYSQL=yes"

ports:
- "80:80"
volumes:
- upload:/app/upload
image:
crramirez/limesurvey:latest

volumes:
mysql:
upload:
60 changes: 30 additions & 30 deletions docker-compose.pgsql.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
version: '2'

services:
pgsql:
environment:
- "POSTGRES_PASSWORD=limesurvey"
ports:
- "5432:5432"
volumes:
- "postgres:/var/lib/postgresql/data"
image:
postgres

limesurvey:
links:
- pgsql

environment:
- "DISABLE_MYSQL=yes"

ports:
- "80:80"
volumes:
- upload:/app/upload
image:
crramirez/limesurvey:latest

volumes:
postgres:
upload:
version: '2'

services:
pgsql:
environment:
- "POSTGRES_PASSWORD=limesurvey"
ports:
- "5432:5432"
volumes:
- "postgres:/var/lib/postgresql/data"
image:
postgres

limesurvey:
links:
- pgsql

environment:
- "DISABLE_MYSQL=yes"

ports:
- "80:80"
volumes:
- upload:/app/upload
image:
crramirez/limesurvey:latest

volumes:
postgres:
upload:
27 changes: 14 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
version: '2'
services:
limesurvey:
ports:
- "80:80"
volumes:
- mysql:/var/lib/mysql
- upload:/app/upload
image:
crramirez/limesurvey:latest
volumes:
mysql:
upload:
version: '2'
services:
limesurvey:
build: .
ports:
- "80:80"
volumes:
- mysql:/var/lib/mysql
- upload:/app/upload
image:
crramirez/limesurvey:latest
volumes:
mysql:
upload:
Binary file modified limesurvey.tar.bz2
Binary file not shown.

0 comments on commit 86f06f2

Please sign in to comment.