forked from ungleich-public/cdist
		
	finish cdist bootstrap
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								74f9a6e98a
							
						
					
				
			
			
				commit
				
					
						0a3705c4f2
					
				
			
		
					 1 changed files with 44 additions and 9 deletions
				
			
		| 
						 | 
					@ -86,19 +86,54 @@ cdist-user% git branch
 | 
				
			||||||
* mycompany
 | 
					* mycompany
 | 
				
			||||||
--------------------------------------------------------------------------------
 | 
					--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					From now on, you can use git as usual to commit your changes in your own branch.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					PUBLISHING THE CONFIGURATION
 | 
				
			||||||
 | 
					----------------------------
 | 
				
			||||||
 | 
					Usually a development machine like a notebook should be considered
 | 
				
			||||||
 | 
					temporary only. For this reason and to enable shareability, the configuration
 | 
				
			||||||
 | 
					should be published to another device as early as possible. The following
 | 
				
			||||||
 | 
					example shows how to publish the configuration to another host that is
 | 
				
			||||||
 | 
					reachable via ssh and has git installed:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
own account  / server, one/multiple users
 | 
					--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					# Create bare git repository on the host named "loch"
 | 
				
			||||||
 | 
					cdist% ssh loch "GIT_DIR=/home/nutzer/cdist git init"
 | 
				
			||||||
 | 
					Initialized empty Git repository in /home/nutzer/cdist/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clone
 | 
					# Add remote git repo to git config
 | 
				
			||||||
update
 | 
					cdist% git remote add loch loch:/home/nutzer/cdist 
 | 
				
			||||||
branches
 | 
					 | 
				
			||||||
own branch => very early [before first change?]
 | 
					 | 
				
			||||||
=> no, first quick intro, then do it right
 | 
					 | 
				
			||||||
ssh-keys
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Add keys (requires password for every identity file)
 | 
					# Configure the mycompany branch to push to loch
 | 
				
			||||||
 | 
					cdist% git config branch.mycompany.remote loch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Configure mycompany branch to push into remote master branch
 | 
				
			||||||
 | 
					cdist% git config branch.mycompany.merge refs/heads/master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Push mycompany branch to remote branch master initially
 | 
				
			||||||
 | 
					cdist% git push loch mycompany:refs/heads/master
 | 
				
			||||||
 | 
					--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Now you have setup the git repository to synchronise the **mycompany**
 | 
				
			||||||
 | 
					branch with the **master** branch on the host **loch**. Thus you can commit
 | 
				
			||||||
 | 
					as usual in your branch and push out changes by entering ***git push***.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					UPDATING FROM ORIGIN
 | 
				
			||||||
 | 
					--------------------
 | 
				
			||||||
 | 
					Whenever you want to update your cdist installation, you can use git to do so:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					# Update git repository with latest changes from origin
 | 
				
			||||||
 | 
					cdist% git fetch origin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Update current branch with master branch from origin
 | 
				
			||||||
 | 
					cdist% git merge origin/master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Alternative: Update current branch with 2.0 branch from origin
 | 
				
			||||||
 | 
					cdist% git merge origin/2.0
 | 
				
			||||||
 | 
					--------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SEE ALSO
 | 
					SEE ALSO
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue