mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-04 04:12:45 +00:00 
			
		
		
		
	Codesstyle enhancements
This commit is contained in:
		@@ -1,5 +1,5 @@
 | 
				
			|||||||
##############################################################################
 | 
					##############################################################################
 | 
				
			||||||
# Environment variables to configure the db service in docker-compose.yml.   #
 | 
					# Environment variables used by the Docker db service.                       #
 | 
				
			||||||
#                                                                            #
 | 
					#                                                                            #
 | 
				
			||||||
# More information about the environment variables can be found here:        #
 | 
					# More information about the environment variables can be found here:        #
 | 
				
			||||||
# https://hub.docker.com/_/postgres                                          #
 | 
					# https://hub.docker.com/_/postgres                                          #
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
services:
 | 
					services:
 | 
				
			||||||
  nopaque:
 | 
					  nopaque:
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - FLASK_DEBUG=True
 | 
					      FLASK_DEBUG: "True"
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "5000:5000"
 | 
					      - "5000:5000"
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
services:
 | 
					services:
 | 
				
			||||||
  nopaque:
 | 
					  nopaque:
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - NOPAQUE_IS_PRIMARY_INSTANCE=False
 | 
					      NOPAQUE_IS_PRIMARY_INSTANCE: "False"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,29 +6,26 @@ networks:
 | 
				
			|||||||
services:
 | 
					services:
 | 
				
			||||||
  nopaque:
 | 
					  nopaque:
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - NOPAQUE_PROXY_FIX_ENABLED=True
 | 
					      NOPAQUE_PROXY_FIX_ENABLED: "True"
 | 
				
			||||||
      - NOPAQUE_PROXY_FIX_X_FOR=1
 | 
					      NOPAQUE_PROXY_FIX_X_FOR: "1"
 | 
				
			||||||
      - NOPAQUE_PROXY_FIX_X_HOST=1
 | 
					      NOPAQUE_PROXY_FIX_X_HOST: "1"
 | 
				
			||||||
      - NOPAQUE_PROXY_FIX_X_PORT=1
 | 
					      NOPAQUE_PROXY_FIX_X_PORT: "1"
 | 
				
			||||||
      - NOPAQUE_PROXY_FIX_X_PREFIX=0
 | 
					      NOPAQUE_PROXY_FIX_X_PREFIX: "0"
 | 
				
			||||||
      - NOPAQUE_PROXY_FIX_X_PROTO=1
 | 
					      NOPAQUE_PROXY_FIX_X_PROTO: "1"
 | 
				
			||||||
    labels:
 | 
					    labels:
 | 
				
			||||||
      - "traefik.docker.network=traefik"
 | 
					 | 
				
			||||||
      - "traefik.enable=true"
 | 
					      - "traefik.enable=true"
 | 
				
			||||||
      ### <http> ###
 | 
					      # HTTP
 | 
				
			||||||
      - "traefik.http.routers.http-nopaque.entrypoints=http"
 | 
					      - "traefik.http.routers.http-nopaque.entrypoints=http"
 | 
				
			||||||
      - "traefik.http.routers.http-nopaque.middlewares=redirect-to-https@file"
 | 
					      - "traefik.http.routers.http-nopaque.middlewares=redirect-to-https@file"
 | 
				
			||||||
      # Replace <nopaque-domain> with your domain
 | 
					      # Replace <nopaque-domain> with your domain
 | 
				
			||||||
      - "traefik.http.routers.http-nopaque.rule=Host(`<nopaque-domain>`)"
 | 
					      - "traefik.http.routers.http-nopaque.rule=Host(`<nopaque-domain>`)"
 | 
				
			||||||
      ### </http> ###
 | 
					      # HTTPS
 | 
				
			||||||
      ### <https> ###
 | 
					 | 
				
			||||||
      - "traefik.http.routers.https-nopaque.entrypoints=https"
 | 
					      - "traefik.http.routers.https-nopaque.entrypoints=https"
 | 
				
			||||||
      - "traefik.http.routers.https-nopaque.middlewares=hsts-header@file"
 | 
					      - "traefik.http.routers.https-nopaque.middlewares=hsts-header@file"
 | 
				
			||||||
      # Replace <nopaque-domain> with your domain
 | 
					      # Replace <nopaque-domain> with your domain
 | 
				
			||||||
      - "traefik.http.routers.https-nopaque.rule=Host(`<nopaque-domain>`)"
 | 
					      - "traefik.http.routers.https-nopaque.rule=Host(`<nopaque-domain>`)"
 | 
				
			||||||
      - "traefik.http.routers.https-nopaque.tls.certresolver=<CERTRESOLVER>"
 | 
					      - "traefik.http.routers.https-nopaque.tls.certresolver=<CERTRESOLVER>"
 | 
				
			||||||
      - "traefik.http.routers.https-nopaque.tls.options=intermediate@file"
 | 
					      - "traefik.http.routers.https-nopaque.tls.options=intermediate@file"
 | 
				
			||||||
      ### </https> ###
 | 
					 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - default
 | 
					      - "nopaque"
 | 
				
			||||||
      - traefik
 | 
					      - "traefik"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +1,5 @@
 | 
				
			|||||||
##############################################################################
 | 
					##############################################################################
 | 
				
			||||||
# Environment variables to configure the nopaque.                            #
 | 
					# Environment variables used by nopaque.                                     #
 | 
				
			||||||
# - When running nopaque with Docker Compose, these variables are set in the #
 | 
					 | 
				
			||||||
#   `docker-compose.yml` file.                                               #
 | 
					 | 
				
			||||||
# - When running nopaque without Docker, these variables are loaded by       #
 | 
					 | 
				
			||||||
#   nopaque in the config.py file                                            #
 | 
					 | 
				
			||||||
##############################################################################
 | 
					##############################################################################
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -11,6 +7,9 @@
 | 
				
			|||||||
# Flask                                                                      #
 | 
					# Flask                                                                      #
 | 
				
			||||||
# https://flask.palletsprojects.com/en/1.1.x/config/                         #
 | 
					# https://flask.palletsprojects.com/en/1.1.x/config/                         #
 | 
				
			||||||
##############################################################################
 | 
					##############################################################################
 | 
				
			||||||
 | 
					# DEFAULT: /
 | 
				
			||||||
 | 
					# APPLICATION_ROOT=
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# CHOOSE ONE: http, https
 | 
					# CHOOSE ONE: http, https
 | 
				
			||||||
# DEFAULT: http
 | 
					# DEFAULT: http
 | 
				
			||||||
# PREFERRED_URL_SCHEME=
 | 
					# PREFERRED_URL_SCHEME=
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user