Merge branch 'master' into frontend_runtime_config
This commit is contained in:
		
						commit
						4fc355a05d
					
				@ -3,9 +3,9 @@ const fs = require('fs');
 | 
				
			|||||||
let PROXY_CONFIG = require('./proxy.conf');
 | 
					let PROXY_CONFIG = require('./proxy.conf');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PROXY_CONFIG.forEach(entry => {
 | 
					PROXY_CONFIG.forEach(entry => {
 | 
				
			||||||
  entry.target = entry.target.replace("mempool.space", "mempool.ninja");
 | 
					  entry.target = entry.target.replace("mempool.space", "mempool-staging.fra.mempool.space");
 | 
				
			||||||
  entry.target = entry.target.replace("liquid.network", "liquid.place");
 | 
					  entry.target = entry.target.replace("liquid.network", "liquid-staging.fra.mempool.space");
 | 
				
			||||||
  entry.target = entry.target.replace("bisq.markets", "bisq.ninja");
 | 
					  entry.target = entry.target.replace("bisq.markets", "bisq-staging.fra.mempool.space");
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
module.exports = PROXY_CONFIG;
 | 
					module.exports = PROXY_CONFIG;
 | 
				
			||||||
 | 
				
			|||||||
@ -401,7 +401,7 @@ FREEBSD_PKG+=(nginx rsync py39-certbot-nginx mariadb105-server keybase)
 | 
				
			|||||||
FREEBSD_PKG+=(geoipupdate)
 | 
					FREEBSD_PKG+=(geoipupdate)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FREEBSD_UNFURL_PKG=()
 | 
					FREEBSD_UNFURL_PKG=()
 | 
				
			||||||
FREEBSD_UNFURL_PKG+=(nvidia-driver-470-470.129.06 chromium xinit xterm twm ja-sourcehansans-otf)
 | 
					FREEBSD_UNFURL_PKG+=(nvidia-driver-470 chromium xinit xterm twm ja-sourcehansans-otf)
 | 
				
			||||||
FREEBSD_UNFURL_PKG+=(zh-sourcehansans-sc-otf ko-aleefonts-ttf lohit tlwg-ttf)
 | 
					FREEBSD_UNFURL_PKG+=(zh-sourcehansans-sc-otf ko-aleefonts-ttf lohit tlwg-ttf)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#############################
 | 
					#############################
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user