mirror of
				https://github.com/avatao-content/test-tutorial-framework
				synced 2025-11-04 05:32:55 +00:00 
			
		
		
		
	Merge branch 'usersep'
This commit is contained in:
		@@ -8,4 +8,5 @@ crp_config:
 | 
				
			|||||||
    controller:
 | 
					    controller:
 | 
				
			||||||
        ports: ["4444/controller"]
 | 
					        ports: ["4444/controller"]
 | 
				
			||||||
    solvable:
 | 
					    solvable:
 | 
				
			||||||
 | 
					        capabilities: ["SETUID", "SETGID", "CHOWN", "AUDIT_WRITE", "DAC_OVERRIDE"]
 | 
				
			||||||
        ports: ["8888/http"]
 | 
					        ports: ["8888/http"]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,6 +14,4 @@ RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} &&\
 | 
				
			|||||||
    chmod -R 755 ${TFW_WEBIDE_WD}
 | 
					    chmod -R 755 ${TFW_WEBIDE_WD}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
VOLUME ["/home/${AVATAO_USER}"]
 | 
					VOLUME ["/home/${AVATAO_USER}"]
 | 
				
			||||||
USER ${AVATAO_USER}
 | 
					 | 
				
			||||||
WORKDIR /home/${AVATAO_USER}
 | 
					WORKDIR /home/${AVATAO_USER}
 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,7 +43,7 @@ toggle_next.button_state = False
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
if __name__ == '__main__':
 | 
					if __name__ == '__main__':
 | 
				
			||||||
    # pylint: disable=invalid-name
 | 
					    # pylint: disable=invalid-name
 | 
				
			||||||
    ide = SourceCodeEventHandler(key='webide', directory=TFWENV.WEBIDE_WD, exclude=['*.pyc'])
 | 
					    ide = SourceCodeEventHandler(key='webide', allowed_directories=[TFWENV.WEBIDE_WD], directory=TFWENV.WEBIDE_WD, exclude=['*.pyc'])
 | 
				
			||||||
    terminado = TerminadoEventHandler(key='shell', monitor=BashMonitor(TFWENV.HISTFILE))
 | 
					    terminado = TerminadoEventHandler(key='shell', monitor=BashMonitor(TFWENV.HISTFILE))
 | 
				
			||||||
    terminado.historymonitor.subscribe_callback(cenator)
 | 
					    terminado.historymonitor.subscribe_callback(cenator)
 | 
				
			||||||
    terminado.historymonitor.subscribe_callback(selectdir)
 | 
					    terminado.historymonitor.subscribe_callback(selectdir)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,3 +1,4 @@
 | 
				
			|||||||
[program:event_handler_main]
 | 
					[program:event_handler_main]
 | 
				
			||||||
 | 
					user=root
 | 
				
			||||||
directory=%(ENV_TFW_APP_DIR)s
 | 
					directory=%(ENV_TFW_APP_DIR)s
 | 
				
			||||||
command=python3 event_handler_main.py
 | 
					command=python3 event_handler_main.py
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								solvable/supervisor/components/tfw_server.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								solvable/supervisor/components/tfw_server.conf
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
				
			|||||||
 | 
					[program:tfwserver]
 | 
				
			||||||
 | 
					user=root
 | 
				
			||||||
 | 
					directory=%(ENV_TFW_APP_DIR)s
 | 
				
			||||||
 | 
					command=python3 tfw_server.py
 | 
				
			||||||
		Reference in New Issue
	
	Block a user