mwinter/unboundedpress
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

everything seems to be working with this configuration

Browse source
This commit is contained in:
Michael Winter 2023-04-15 11:44:18 +00:00
parent ada0ea2831
commit 5de21610de
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
docker-compose.yml
View file

@ -33,7 +33,7 @@ services:
environment: environment:
- DEFAULT_EMAIL=${EMAIL} - DEFAULT_EMAIL=${EMAIL}
# Uncomment this for testing # Uncomment this for testing
- LETSENCRYPT_TEST=true #- LETSENCRYPT_TEST=true
volumes_from: volumes_from:
- nginx-proxy - nginx-proxy
volumes: volumes:
@ -59,11 +59,11 @@ services:
- portfolio:/src/node_modules - portfolio:/src/node_modules
- ./portfolio/src:/src - ./portfolio/src:/src
environment: environment:
- VIRTUAL_HOST=${DOMAIN},*.${DOMAIN} - VIRTUAL_HOST=${DOMAIN},www.${DOMAIN}
- VIRTUAL_PATH=/ - VIRTUAL_PATH=/
#- VIRTUAL_DEST=/ #- VIRTUAL_DEST=/
- VIRTUAL_PORT=3000 - VIRTUAL_PORT=3000
- LETSENCRYPT_HOST=${DOMAIN} #,*.${DOMAIN} - LETSENCRYPT_HOST=${DOMAIN},www.${DOMAIN},gitea.${DOMAIN} #this last one is for legacy support
- LETSENCRYPT_EMAIL=${EMAIL} - LETSENCRYPT_EMAIL=${EMAIL}
ports: ports:
- "3000:3000" - "3000:3000"
@ -144,7 +144,7 @@ services:
- ME_CONFIG_BASICAUTH_PASSWORD=${PASSWORD} - ME_CONFIG_BASICAUTH_PASSWORD=${PASSWORD}
- ME_CONFIG_SITE_BASEURL=/admin - ME_CONFIG_SITE_BASEURL=/admin
- ME_CONFIG_SITE_GRIDFS_ENABLED=true - ME_CONFIG_SITE_GRIDFS_ENABLED=true
- VIRTUAL_HOST=${DOMAIN},*.${DOMAIN},admin.${DOMAIN} - VIRTUAL_HOST=${DOMAIN},admin.${DOMAIN}
- VIRTUAL_PATH=/admin/ - VIRTUAL_PATH=/admin/
- VIRTUAL_PORT=8081 - VIRTUAL_PORT=8081
#volumes: #volumes:
@ -176,7 +176,7 @@ services:
# } # }
# This does not seem to do anything but should somehow use a file for the realm creations # This does not seem to do anything but should somehow use a file for the realm creations
#/fileRealmAuthenticator/users[userid='admin']/password->'${PASSWORD}'; #/fileRealmAuthenticator/users[userid='admin']/password->'${PASSWORD}';
- VIRTUAL_HOST=${DOMAIN},*.${DOMAIN},restheart.${DOMAIN},api.${DOMAIN} - VIRTUAL_HOST=${DOMAIN},www.${DOMAIN}
- VIRTUAL_PATH=/api/ - VIRTUAL_PATH=/api/
- VIRTUAL_DEST=/api/ - VIRTUAL_DEST=/api/
- VIRTUAL_PORT=8080 - VIRTUAL_PORT=8080
@ -212,7 +212,7 @@ services:
- LFS_START_SERVER=true - LFS_START_SERVER=true
- DISABLE_REGISTRATION=true - DISABLE_REGISTRATION=true
- RUN_MODE=prod - RUN_MODE=prod
- VIRTUAL_HOST=${DOMAIN},*.${DOMAIN},code.${DOMAIN},git.${DOMAIN},gitea.${DOMAIN} - VIRTUAL_HOST=${DOMAIN},www.${DOMAIN},gitea.${DOMAIN} # this last one is for legacy support
- VIRTUAL_PORT=4000 - VIRTUAL_PORT=4000
- VIRTUAL_PATH=/code/ - VIRTUAL_PATH=/code/
- VIRTUAL_DEST=/ - VIRTUAL_DEST=/
@ -261,20 +261,19 @@ services:
- MYSQL_HOST=mysql-nextcloud - MYSQL_HOST=mysql-nextcloud
- NEXTCLOUD_ADMIN_USER=${USER} - NEXTCLOUD_ADMIN_USER=${USER}
- NEXTCLOUD_ADMIN_PASSWORD=${PASSWORD} - NEXTCLOUD_ADMIN_PASSWORD=${PASSWORD}
- NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN} *.${DOMAIN} cloud.${DOMAIN} nextcloud.${DOMAIN} #localdev.${DOMAIN} - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN} www.${DOMAIN}
- NEXTCLOUD_INIT_LOCK=true #- NEXTCLOUD_INIT_LOCK=true
#- APACHE_DISABLE_REWRITE_IP=1 - APACHE_DISABLE_REWRITE_IP=1
- TRUSTED_PROXIES=nginx-proxy - TRUSTED_PROXIES=nginx-proxy
#- OVERWRITEHOST=${DOMAIN}:8888 - OVERWRITEHOST=${DOMAIN}
#- OVERWRITEWEBROOT=/cloud - OVERWRITEWEBROOT=/cloud
#- OVERWRITEPROTOCOL=https - OVERWRITEPROTOCOL=https
#- OVERWRITECLIURL=http://localhost/ - OVERWRITECLIURL=http://localhost/
- VIRTUAL_HOST=${DOMAIN},*.${DOMAIN},cloud.${DOMAIN},nextcloud.${DOMAIN} #,localdev.${DOMAIN} # NOTE: These configurations above make it work with the subdirectory
- VIRTUAL_PORT=8888 # but you cannot set VIRTUAL_PORT
# TODO: It would be great to move thie to a subdirectory ${DOMAIN}/cloud # for reasons I have no idea
# as opposed to a subdomain cloud.${DOMAIN} - VIRTUAL_HOST=${DOMAIN},www.${DOMAIN}
# but it is really, really difficult with nextcloud - VIRTUAL_PATH=/cloud/
- VIRTUAL_PATH=/cloud
- VIRTUAL_DEST=/ - VIRTUAL_DEST=/
# TODO: add redis and chron # TODO: add redis and chron
#- REDIS_HOST=redis #- REDIS_HOST=redis

10
nginx/vhost.d/gitea.unboundedpress.org
View file

@ -1,3 +1,13 @@
## Start of configuration add by letsencrypt container
location ^~ /.well-known/acme-challenge/ {
auth_basic off;
auth_request off;
allow all;
root /usr/share/nginx/html;
try_files $uri =404;
break;
}
## End of configuration add by letsencrypt container
# This is needed for legacy support # This is needed for legacy support
location = / { location = / {
rewrite ^ http://gitea.unboundedpress.org/code/mwinter/ redirect; rewrite ^ http://gitea.unboundedpress.org/code/mwinter/ redirect;