Merge branch 'master' of ssh://git.chefkoch.net:2222/pub/make-deploy
This commit is contained in:
		
						commit
						3f2da20178
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		
							
								
								
									
										4
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
					@ -18,7 +18,7 @@ pre-deploy:
 | 
				
			||||||
ifdef DEPLOY_HOSTS
 | 
					ifdef DEPLOY_HOSTS
 | 
				
			||||||
	@- echo "\n### running pre-deploy script(s)"
 | 
						@- echo "\n### running pre-deploy script(s)"
 | 
				
			||||||
	@- $(foreach host,$(DEPLOY_HOSTS), \
 | 
						@- $(foreach host,$(DEPLOY_HOSTS), \
 | 
				
			||||||
		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh pre-deploy.sh; sh pre-deploy_$(host).sh"; \
 | 
							ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh pre-deploy.sh $(host); sh pre-deploy_$(host).sh"; \
 | 
				
			||||||
	)
 | 
						)
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,7 +26,7 @@ post-deploy:
 | 
				
			||||||
ifdef DEPLOY_HOSTS
 | 
					ifdef DEPLOY_HOSTS
 | 
				
			||||||
	@- echo "\n### running post-deploy script(s)"
 | 
						@- echo "\n### running post-deploy script(s)"
 | 
				
			||||||
	@- $(foreach host,$(DEPLOY_HOSTS), \
 | 
						@- $(foreach host,$(DEPLOY_HOSTS), \
 | 
				
			||||||
		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh post-deploy.sh; sh post-deploy_$(host).sh"; \
 | 
							ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh post-deploy.sh $(host); sh post-deploy_$(host).sh"; \
 | 
				
			||||||
	)
 | 
						)
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue