forked from zaclys/searxng
		
	Merge pull request #1720 from Monogramm/docker/config
Config for instance name and autocomplete
This commit is contained in:
		
						commit
						2946c5f106
					
				
					 2 changed files with 7 additions and 1 deletions
				
			
		| 
						 | 
					@ -11,7 +11,9 @@ ARG TIMESTAMP_UWSGI=0
 | 
				
			||||||
ARG LABEL_VCS_REF=
 | 
					ARG LABEL_VCS_REF=
 | 
				
			||||||
ARG LABEL_VCS_URL=
 | 
					ARG LABEL_VCS_URL=
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV BASE_URL= \
 | 
					ENV INSTANCE_NAME=searx \
 | 
				
			||||||
 | 
					    AUTOCOMPLETE= \
 | 
				
			||||||
 | 
					    BASE_URL= \
 | 
				
			||||||
    MORTY_KEY= \
 | 
					    MORTY_KEY= \
 | 
				
			||||||
    MORTY_URL=
 | 
					    MORTY_URL=
 | 
				
			||||||
EXPOSE 8080
 | 
					EXPOSE 8080
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,6 +29,8 @@ do
 | 
				
			||||||
	    printf "  -f  Always update on the configuration files (existing files are renamed with the .old suffix)\n"
 | 
						    printf "  -f  Always update on the configuration files (existing files are renamed with the .old suffix)\n"
 | 
				
			||||||
	    printf "      Without this option, new configuration files are copied with the .new suffix\n"
 | 
						    printf "      Without this option, new configuration files are copied with the .new suffix\n"
 | 
				
			||||||
	    printf "\nEnvironment variables:\n\n"
 | 
						    printf "\nEnvironment variables:\n\n"
 | 
				
			||||||
 | 
						    printf "  INSTANCE_NAME settings.yml : general.instance_name\n"
 | 
				
			||||||
 | 
						    printf "  AUTOCOMPLETE  settings.yml : search.autocomplete\n"
 | 
				
			||||||
	    printf "  BASE_URL      settings.yml : server.base_url\n"
 | 
						    printf "  BASE_URL      settings.yml : server.base_url\n"
 | 
				
			||||||
	    printf "  MORTY_URL     settings.yml : result_proxy.url\n"
 | 
						    printf "  MORTY_URL     settings.yml : result_proxy.url\n"
 | 
				
			||||||
	    printf "  MORTY_KEY     settings.yml : result_proxy.key\n"
 | 
						    printf "  MORTY_KEY     settings.yml : result_proxy.key\n"
 | 
				
			||||||
| 
						 | 
					@ -53,6 +55,8 @@ patch_searx_settings() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # update settings.yml
 | 
					    # update settings.yml
 | 
				
			||||||
    sed -i -e "s|base_url : False|base_url : ${BASE_URL}|g" \
 | 
					    sed -i -e "s|base_url : False|base_url : ${BASE_URL}|g" \
 | 
				
			||||||
 | 
					       -e "s/instance_name : \"searx\"/instance_name : \"${INSTANCE_NAME}\"/g" \
 | 
				
			||||||
 | 
					       -e "s/autocomplete : \"\"/autocomplete : \"${AUTOCOMPLETE}\"/g" \
 | 
				
			||||||
       -e "s/ultrasecretkey/$(openssl rand -hex 32)/g" \
 | 
					       -e "s/ultrasecretkey/$(openssl rand -hex 32)/g" \
 | 
				
			||||||
       "${CONF}"
 | 
					       "${CONF}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue