Skip to content

Commit

Permalink
Changes for me
Browse files Browse the repository at this point in the history
  • Loading branch information
lusrmgr committed Oct 13, 2022
1 parent 061894f commit b6596e3
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 112 deletions.
32 changes: 3 additions & 29 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ services:
environment:
PGDATA: /var/lib/postgresql/data/guacamole
POSTGRES_DB: guacamole_db
POSTGRES_PASSWORD: 'ChooseYourOwnPasswordHere1234'
POSTGRES_PASSWORD: 'qjnEwAJEdqH3o6arPeTQ'
POSTGRES_USER: guacamole_user
image: postgres:13.4-buster
networks:
Expand All @@ -127,39 +127,13 @@ services:
GUACD_HOSTNAME: guacd
POSTGRES_DATABASE: guacamole_db
POSTGRES_HOSTNAME: postgres
POSTGRES_PASSWORD: 'ChooseYourOwnPasswordHere1234'
POSTGRES_PASSWORD: 'qjnEwAJEdqH3o6arPeTQ'
POSTGRES_USER: guacamole_user
image: guacamole/guacamole
links:
- guacd
networks:
guacnetwork_compose:
ports:
## enable next line if not using nginx
## - 8080:8080/tcp # Guacamole is on :8080/guacamole, not /.
## enable next line when using nginx
- 8080/tcp
- 8080:8080/tcp # Guacamole is on :8080/guacamole, not /.
restart: always

########### optional ##############
# nginx
nginx:
container_name: nginx_guacamole_compose
restart: always
image: nginx
volumes:
- ./nginx/ssl/self.cert:/etc/nginx/ssl/self.cert:ro
- ./nginx/ssl/self-ssl.key:/etc/nginx/ssl/self-ssl.key:ro
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
- ./nginx/mysite.template:/etc/nginx/conf.d/default.conf:ro
ports:
- 8443:443
links:
- guacamole
networks:
guacnetwork_compose:
# run nginx
command: /bin/bash -c "nginx -g 'daemon off;'"
# nginx-debug-mode
# command: /bin/bash -c "nginx-debug -g 'daemon off;'"
####################################################################################
46 changes: 0 additions & 46 deletions nginx/mysite.template

This file was deleted.

32 changes: 0 additions & 32 deletions nginx/nginx.conf

This file was deleted.

5 changes: 0 additions & 5 deletions prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ then
fi
echo "Preparing folder init and creating ./init/initdb.sql"
mkdir ./init >/dev/null 2>&1
mkdir -p ./nginx/ssl >/dev/null 2>&1
chmod -R +x ./init
docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --postgres > ./init/initdb.sql
echo "done"
echo "Creating SSL certificates"
openssl req -nodes -newkey rsa:2048 -new -x509 -keyout nginx/ssl/self-ssl.key -out nginx/ssl/self.cert -subj '/C=DE/ST=BY/L=Hintertupfing/O=Dorfwirt/OU=Theke/CN=www.createyourown.domain/[email protected]'
echo "You can use your own certificates by placing the private key in nginx/ssl/self-ssl.key and the cert in nginx/ssl/self.cert"
echo "done"

0 comments on commit b6596e3

Please sign in to comment.