forked from Botanical/BotanJS
		
	Merge remote-tracking branch 'origin/master' into Astro
This commit is contained in:
		@@ -5,6 +5,11 @@ sys.path.append( os.path.abspath( "." ) )
 | 
				
			|||||||
from botanjs.service.jwork import app, JWork
 | 
					from botanjs.service.jwork import app, JWork
 | 
				
			||||||
from botanjs.config import Config as config
 | 
					from botanjs.config import Config as config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SiteRoot = os.path.abspath( "." )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Setting the SiteRoot for config
 | 
				
			||||||
 | 
					config["Paths"]["SiteRoot"] = SiteRoot;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bmap = os.path.join( config["Paths"]["Cache"], "botanjs", "bmap.xml" )
 | 
					bmap = os.path.join( config["Paths"]["Cache"], "botanjs", "bmap.xml" )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
app.conf.update( BROKER_URL = config["BotanJS"]["CeleryBroker"] )
 | 
					app.conf.update( BROKER_URL = config["BotanJS"]["CeleryBroker"] )
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user