forked from ungleich-public/cdist
		
	also add some bugs
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								78a5bbf6e8
							
						
					
				
			
			
				commit
				
					
						d0eeafd228
					
				
			
		
					 2 changed files with 11 additions and 2 deletions
				
			
		
							
								
								
									
										11
									
								
								bin/cdist
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								bin/cdist
									
										
									
									
									
								
							|  | @ -63,17 +63,24 @@ def base_directory(): | ||||||
|    os.chdir(os.path.join(os.path.dirname(__file__), os.pardir)) |    os.chdir(os.path.join(os.path.dirname(__file__), os.pardir)) | ||||||
|    return os.getcwd() |    return os.getcwd() | ||||||
| 
 | 
 | ||||||
|  | def remote_base_directory(): | ||||||
|  |    return "/var/lib/cdist" | ||||||
|  | 
 | ||||||
| def conf_directory(): | def conf_directory(): | ||||||
|    """Returns path to main configuration directory""" |    """Returns path to main configuration directory""" | ||||||
|    return os.path.join(base_directory(), "conf") |    return os.path.join(base_directory(), "conf") | ||||||
| 
 | 
 | ||||||
|  | def remote_conf_directory(): | ||||||
|  |    """Returns path to remote main configuration directory""" | ||||||
|  |    return os.path.join(remote_base_directory(), "conf") | ||||||
|  | 
 | ||||||
| def global_explorer_directory(): | def global_explorer_directory(): | ||||||
|    """Returns path to directory containing the global explorers""" |    """Returns path to directory containing the global explorers""" | ||||||
|    return os.path.join(conf_directory(), "explorer") |    return os.path.join(conf_directory(), "explorer") | ||||||
| 
 | 
 | ||||||
| def remote_global_explorer_directory(): | def remote_global_explorer_directory(): | ||||||
|    """Returns path to directory containing the global explorers""" |    """Returns path to the remote directory containing the global explorers""" | ||||||
|    return os.path.join(conf_directory(), "explorer") |    return os.path.join(remote_conf_directory(), "explorer") | ||||||
| 
 | 
 | ||||||
| def list_global_explorers(): | def list_global_explorers(): | ||||||
|    """Return list of available explorers""" |    """Return list of available explorers""" | ||||||
|  |  | ||||||
|  | @ -1,2 +1,4 @@ | ||||||
| - rewrite in python? | - rewrite in python? | ||||||
| - support non-ssh access? | - support non-ssh access? | ||||||
|  | 
 | ||||||
|  | - Bug: os.path.join() may be wrong for the remote side! | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue