mirror of
				https://git.tt-rss.org/fox/ttrss-docker-compose
				synced 2025-11-04 12:14:12 +01:00 
			
		
		
		
	re-enable nginx_xaccel; remove the rest of sed stuff from startup
This commit is contained in:
		
							parent
							
								
									5e2ad8d1da
								
							
						
					
					
						commit
						52b7a1260f
					
				
					 6 changed files with 12 additions and 8 deletions
				
			
		| 
						 | 
					@ -57,7 +57,7 @@ ENV TTRSS_SMTP_FROM_ADDRESS="noreply@your.domain.dom"
 | 
				
			||||||
ENV TTRSS_DIGEST_SUBJECT="[tt-rss] New headlines for last 24 hours"
 | 
					ENV TTRSS_DIGEST_SUBJECT="[tt-rss] New headlines for last 24 hours"
 | 
				
			||||||
ENV TTRSS_CHECK_FOR_UPDATES="true"
 | 
					ENV TTRSS_CHECK_FOR_UPDATES="true"
 | 
				
			||||||
ENV TTRSS_ENABLE_GZIP_OUTPUT=""
 | 
					ENV TTRSS_ENABLE_GZIP_OUTPUT=""
 | 
				
			||||||
ENV TTRSS_PLUGINS="auth_internal, note"
 | 
					ENV TTRSS_PLUGINS="auth_internal, note, nginx_xaccel"
 | 
				
			||||||
ENV TTRSS_LOG_DESTINATION="sql"
 | 
					ENV TTRSS_LOG_DESTINATION="sql"
 | 
				
			||||||
ENV TTRSS_CONFIG_VERSION="26"
 | 
					ENV TTRSS_CONFIG_VERSION="26"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -170,5 +170,9 @@
 | 
				
			||||||
	// vim:ft=php
 | 
						// vim:ft=php
 | 
				
			||||||
	$snippets = glob("/opt/tt-rss/config.d/*.php");
 | 
						$snippets = glob("/opt/tt-rss/config.d/*.php");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	foreach ($snippets as $snippet) 
 | 
						foreach ($snippets as $snippet) {
 | 
				
			||||||
		require_once $snippet;
 | 
							require_once $snippet;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						define('NGINX_XACCEL_PREFIX', '/tt-rss');
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,7 @@
 | 
				
			||||||
	$snippets = glob("/opt/tt-rss/config.d/*.php");
 | 
						$snippets = glob("/opt/tt-rss/config.d/*.php");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	foreach ($snippets as $snippet) 
 | 
						foreach ($snippets as $snippet) {
 | 
				
			||||||
		require_once $snippet;
 | 
							require_once $snippet;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										1
									
								
								src/app/config.php-xaccel
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								src/app/config.php-xaccel
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
						define('NGINX_XACCEL_PREFIX', '/tt-rss');
 | 
				
			||||||
| 
						 | 
					@ -3,4 +3,4 @@
 | 
				
			||||||
sed -e "s/define('\([A-Z_]\+\)', [^)]\+/define('\1', getenv('TTRSS_\1')/" \
 | 
					sed -e "s/define('\([A-Z_]\+\)', [^)]\+/define('\1', getenv('TTRSS_\1')/" \
 | 
				
			||||||
	< config.php-dist > config.docker.php
 | 
						< config.php-dist > config.docker.php
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cat config.php-config.d >> config.docker.php
 | 
					cat config.php-config.d config.php-xaccel >> config.docker.php
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -67,10 +67,6 @@ fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ ! -s $DST_DIR/config.php ]; then
 | 
					if [ ! -s $DST_DIR/config.php ]; then
 | 
				
			||||||
	cp /config.docker.php $DST_DIR/config.php
 | 
						cp /config.docker.php $DST_DIR/config.php
 | 
				
			||||||
 | 
					 | 
				
			||||||
	cat >> $DST_DIR/config.php << EOF
 | 
					 | 
				
			||||||
		define('NGINX_XACCEL_PREFIX', '/tt-rss');
 | 
					 | 
				
			||||||
EOF
 | 
					 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
	egrep -q 'SELF_URL_PATH.*getenv' $DST_DIR/config.php || \
 | 
						egrep -q 'SELF_URL_PATH.*getenv' $DST_DIR/config.php || \
 | 
				
			||||||
		echo -e "\nWARNING: you're using old-style config.php, overrides via .env will not work.\n" >/dev/stderr
 | 
							echo -e "\nWARNING: you're using old-style config.php, overrides via .env will not work.\n" >/dev/stderr
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue