remove comment and redis password
This commit is contained in:
		
							parent
							
								
									510eb9c929
								
							
						
					
					
						commit
						c4ae96976a
					
				@ -18,9 +18,6 @@ services:
 | 
				
			|||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - nextcloud:/var/www/html
 | 
					      - nextcloud:/var/www/html
 | 
				
			||||||
      #- ./config.php:/var/www/html/config/config.php
 | 
					 | 
				
			||||||
      #- ./zz-php-custom.ini:/usr/local/etc/php/conf.d/zz-php-custom.ini
 | 
					 | 
				
			||||||
      #- ./zz-php-fpm-custom.conf:/usr/local/etc/php-fpm.d/zz-php-custom.conf
 | 
					 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - "TZ=Europe/Paris"
 | 
					      - "TZ=Europe/Paris"
 | 
				
			||||||
      - REDIS_HOST=redis
 | 
					      - REDIS_HOST=redis
 | 
				
			||||||
@ -50,6 +47,7 @@ services:
 | 
				
			|||||||
    container_name: redis
 | 
					    container_name: redis
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - "TZ=Europe/Paris"
 | 
					      - "TZ=Europe/Paris"
 | 
				
			||||||
 | 
					      - ALLOW_EMPTY_PASSWORD=yes
 | 
				
			||||||
    env_file: ./secrets/librezo.secrets
 | 
					    env_file: ./secrets/librezo.secrets
 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - nextcloud
 | 
					      - nextcloud
 | 
				
			||||||
@ -72,16 +70,9 @@ services:
 | 
				
			|||||||
    container_name: collabora
 | 
					    container_name: collabora
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - ./loolwsd.xml:/etc/loolwsd/loolwsd.xml
 | 
					      - ./loolwsd.xml:/etc/loolwsd/loolwsd.xml
 | 
				
			||||||
     #- ./zz-php-fpm-custom.conf:/usr/local/etc/php-fpm.d/zz-php-custom.conf
 | 
					 | 
				
			||||||
#    ports:
 | 
					 | 
				
			||||||
#      - 9980:9980
 | 
					 | 
				
			||||||
#    expose:
 | 
					 | 
				
			||||||
#      - "9980" 
 | 
					 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - "TZ=Europe/Paris"
 | 
					      - "TZ=Europe/Paris"
 | 
				
			||||||
      - domain=cloud\.calad\.re
 | 
					      - domain=cloud\.calad\.re
 | 
				
			||||||
#      - username=${COLLABORA_USER}
 | 
					 | 
				
			||||||
#      - password=${COLLABORA_PASSWORD}
 | 
					 | 
				
			||||||
      - serveur_name=code\.calad\.re
 | 
					      - serveur_name=code\.calad\.re
 | 
				
			||||||
      - "extra_params=--o:ssl.enable=false --o:ssl.termination=true"
 | 
					      - "extra_params=--o:ssl.enable=false --o:ssl.termination=true"
 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
 | 
				
			|||||||
@ -4,5 +4,3 @@ POSTGRES_USER=nc
 | 
				
			|||||||
POSTGRES_HOST=nextcloud-db
 | 
					POSTGRES_HOST=nextcloud-db
 | 
				
			||||||
username=nextcloud
 | 
					username=nextcloud
 | 
				
			||||||
password=__COLLABORA_PASSWORD__
 | 
					password=__COLLABORA_PASSWORD__
 | 
				
			||||||
REDIS_PASSWORD=__REDIS_PASSWORD__
 | 
					 | 
				
			||||||
REDIS_HOST_PASSWORD=$REDIS_PASSWORD
 | 
					 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user