- git fetch: gets changes to update your local repo, but doesn’t overwrite any files you have changed locally
- git pull: does a ‘git fetch’ then ‘git merge’ to pull all changes, and merge any changes to files you’re currently working on too
Setting up a Git server on Ubuntu, accessing from Mac OS X
This wiki post walks you through the key steps configuring a Git server on Ubuntu.
Edit 4/3/12: there’s a lot of other articles on how to setup gitosis on linux – here’s some I followed, but they all have slight variations in the approach: here, here, and here. It seems somewhat hit and miss whether it works or not (as you’ll find if you google for related articles). For me, I could only get this approach working for the user in the gitosis-admin group, and I could not get access for any other users, despite how many variations of the setup instructions I worked through. There’s numerous comments that gitosis is also no longer supported and to use gitolite instead, so I’m going to try installing gitolite instead and will write another post on using this approach . See here for my notes on setting up gitolite, which by the way I got setup with no issues at all.
The setup steps in the wiki article walk you through setting up a gitosis user through which you connect using an ssh public key – since I was trying to follow the instructions but not really sure what I was doing, the key steps (once you’ve already done the above setup) are:
- if you already have an ssh public key, copy it to your remote server and then add it for the gitosis user with this step:
sudo -H -u gitosis gitosis-init < your.pub_file
If you don’t have a .pub file in your ~/.ssh dir, create one with the stepsĀ here. This step is only done one time, for your admin user to get the gitosis-conf project setup.
To add new projects and users is via the gitosis-admin project which you clone from your new server. Once you’ve pulled the project local, all admin of adding new projects is done via making changes to the gitosis.conf file and then pushing the change back to the server.
To add a new group/team add a new section like this:
[group group_name_here] members = dev1@host1 dev2@host2 dev3@host3 writable = Project1 Project2
Notice the members and writable list of source project are space separated, not comma.
For each new user, add their .pub ssh file to the gitosis-admin/keydir directory, named user@host.pub, where user@host matches their id and host at the end of the key details in the file.
Add, commit and push them to the server:
git add . git commit -m "added new key files" git push
To push a new project for the first time, eg’Project1′
- cd into the project you’re adding for the first time and add your remote:
git remote add origin gitosis@your_server_name:Project1.git
- Add, commit and then push your code on the master branch:
git add . git commit -m "commit message" git push origin master
Subsequent pushes, you can just do ‘git push’
Using public keys with ssh
From the client:
mkdir ~/.ssh chmod 700 ~/.ssh ssh-keygen -t rsa
By default the key files (id_rsa = private, id_rsa.pub = public) will be created here: ~/.ssh/
sftp the id_rsa.pub file to the remote machine, and drop it in ~/.ssh.
If you’re using OpenSSH on the remote machine, do this to append the file to the authorized_keys2 file (cd into your .ssh dir):
cat >> authorized_keys2 < id_rsa.pub
Alternatively use ssh-copy-id to copy to the remote machine:
ssh-copy-id -i key-file.pub user@host
Enabling Spring Security Expression-based Access Control for methods in a Spring Roo app
Expression-based Access Control allows you to annotate specific methods with access rules. To enable, add the following element to your webmvc-config.xml file for your Roo webapp (not the security context file, it must be in the context file for the web app):
<security:global-method-security pre-post-annotations="enabled"/>
The explanation for why this needs to be in your webapp context is covered here.
