ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2024-12-22 14:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Kushal 2018-06-28 11:29:19 -04:00 committed by GitHub
commit 0a2fe975b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -16,7 +16,10 @@
# Ignore variable dat # Ignore variable dat
/.env /.env
/log/[a-z0-9-]* /log/[a-z0-9-]*
/data/* /data/mongo/*
/data/mysql/*
/data/pqsql/*
/data/www/*
/backups/* /backups/*
# Ignore Certificate Authority # Ignore Certificate Authority

0
data/www/.keepme Normal file
View File

2
docker-compose.yml
View File

@ -205,7 +205,7 @@ services:
# Web Server # Web Server
# ------------------------------------------------------------ # ------------------------------------------------------------
httpd: httpd:
image: devilbox/${HTTPD_SERVER:-nginx-stable}:0.16 image: devilbox/${HTTPD_SERVER:-nginx-stable}:0.17
restart: always restart: always
environment: environment:

2
docs/configuration-global/https-ssl.rst
View File

@ -62,6 +62,8 @@ valid and trusted SSL certificates without any further work.
.. important:: .. important::
Importing the CA into the browser is also recommended and required for the Devilbox Importing the CA into the browser is also recommended and required for the Devilbox
intranet page to work properly. intranet page to work properly.
You may also import the CA into your Operating System's Keystore. Information on that
is available at `GFI Root Certificate guide <https://manuals.gfi.com/en/kerio/connect/content/server-configuration/ssl-certificates/adding-trusted-root-certificates-to-the-server-1605.html>`_
Import the CA into your browser Import the CA into your browser