Merge branch 'ssl_socket'

* ssl_socket: Ran php-cs-fixer Updated installer to include SSL certificate Remove the backup if it is not needed Working on installer prompting for SSL certificate details Fix socket server to serve HTTPS Added missing require and reorder code Added missing line Allow gravatar over secure connection Work on #165 allowing the socket server to run on HTTPS
REBELinBLUE · Feb 3, 2016 · 388a58d · 388a58d
2 parents c6afa5a + 4366457
commit 388a58d
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 69 deletions.
diff --git a/.env.example b/.env.example
@@ -11,6 +11,9 @@ JWT_SECRET=changeme
 
 SOCKET_URL=http://deploy.app # If using apache you will need to add the port :6001
 SOCKET_PORT=6001
+SOCKET_SSL_KEY_FILE=
+SOCKET_SSL_CERT_FILE=
+SOCKET_SSL_CA_FILE=
 
 DB_TYPE=mysql
 DB_HOST=localhost