- main - earth.li

git merge tools over SSH
by Mark Rogers 09 Sep '10

09 Sep '10

I'm slowly getting my head around git. I am trying it out on a large project, which is on a server (in my office) to which I have only SSH access, or access to the files via Samba. I ran a merge (which took quite while) and now need handle the conflicts. Looking for a decent tool to assist with the merge, I find that most are GUI based, and that suits me fine (and will help me get others in the office to buy-in to using it). However, if I access the files over the samba share and run "git status" it takes a while (10 mins?), presumably because my local git is having to deal with a lot of traffic over the network. Is there a better way to use a local merge tool on a remote repo? -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

5 7

anonymous proxy servers
by Peter Alcibiades 08 Sep '10

08 Sep '10

What does anyone use and or reccommend for an anonymous proxy server? I have come on anonymizer.com and also anonymouse.com. Are these decent? Are there any others to think about? Any that are better? Peter

3 2

IMAP Mail Hosting
by Ted.Harding＠manchester.ac.uk 08 Sep '10

08 Sep '10

Hi Folks, Since it appears that Manchester University has taken a decision that its retired folk shall now be obsolete, email-wise, it is very likely that my current email account will be de-activated soon (I'm already using it on borrowed time). So I shall be looking for a new email address. I'm very happy (in terms of general quality of service) with my ISP (Zen) and would not want to change. However, Zen's email only offers POP3 download and does not offer IMAP access. The webmail interface is clunky and slow, so preliminary sampling and deletion of delivered emails would be very tedious. On the other hand, previewing using IMAP (when it works properly) is very fast. I'm therefore asking if poeple can recommend a provider of email hosting on which I could have an account with IMAP access. I would want this to be of high quality and reliability and capable of handling high levels of incoming traffic (for various reasons, I can get up to 500 emails a day -- most of which I delete on the basis of the Subject alone, some others after a quick look at content, leaving typically some 5-10% to download; so I need to be able to do this quickly). Recommendations? With thanks, Ted. -------------------------------------------------------------------- E-Mail: (Ted Harding) <Ted.Harding(a)manchester.ac.uk> Fax-to-email: +44 (0)870 094 0861 Date: 04-Sep-10 Time: 18:41:52 ------------------------------ XFMail ------------------------------

19 58

Merging the changes between directories
by Mark Rogers 07 Sep '10

07 Sep '10

Suppose I have: DirectoryA - contains a PHP web application, unchanged, exactly as downloaded DirectoryA2 - contains a customised version of DirectoryA DirectoryB - contains a new version of the PHP web application I want to merge the changes that represent DirectoryA -> DirectoryA2, into DirectoryB to create DirectoryB2. This seems to me the sort of thing that diff can do in its sleep but my past attempts have failed. It also probably points at some kind of version control solution, although there is no version control in place at the moment (if this is a good time to implement it then I'm all ears!) I don't expect this to be completely automated, but I believe and expect that using the right tools I can substantially improve the job from the starting point of comparing individual files manually. I have so far got as far as diff --brief -r DirectoryA DirectoryA2 [If specifics help, DirectoryA is version 1.3.8a of ZenCart, DirectoryB is version 1.3.9f of ZenCart, and DirectoryA1 is a site built on version 1.3.8a of ZenCart, but with obvious changes (changes to stylesheets, new images, new plugins, etc). From a practical point of view, DirectoryA2 is mostly a superset of DirectoryA (new product images, plugins, templates, etc) but there are customisations (usually fairly trivial ones) to core files, and there will be a number of files from DirectoryA that were deleted (installation files, docs, etc). There would also be some file and directory permission changes.] -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

2 4

Remote access challenge
by Mark Rogers 07 Sep '10

07 Sep '10

I have a file open on my desktop PC at home, which I want to read now I'm at work. It's just some notes I started writing in a new document in gedit, it's not been saved (I don't think, anyway). I have SSH and NX access to my home desktop. If I connect with NX I get access to my home desktop GUI but not to the session I have currently open with the document in it. Suggestions? -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

5 6

Re: [ALUG] Remote access challenge
by Steve Engledow 07 Sep '10

07 Sep '10

On 7 September 2010 10:17, Ted Harding <Ted.Harding(a)manchester.ac.uk> wrote: > On 07-Sep-10 08:53:26, Simon Ransome wrote: >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> On 07/09/2010 09:22, Mark Rogers wrote: >>> I have a file open on my desktop PC at home, which I want to read >>> now I'm at work. >>> >>> It's just some notes I started writing in a new document in gedit, >>> it's not been saved (I don't think, anyway). >>> >>> I have SSH and NX access to my home desktop. If I connect with NX >>> I get access to my home desktop GUI but not to the session I have >>> currently open with the document in it. Possibly overkill but you could ssh in, install x11vnc (which is a vnc server that provides vnc access to a running X session), run it and then vnc into your machine - tunnelling through ssh for security of course :) Cheers, Steve

1 0

Malicious Javascript
by Dan 07 Sep '10

07 Sep '10

Dear All, Browsing with Namoroka 3.6.8 on Gentoo, I just stumbled across a webpage containing Javascript that was probably trying to install malicious code on my system. The script - claimed (implausibly) to be a malware scanner, and (even more implausibly, because the places it claimed to have looked were Windows-specific directory names that don't exist on my system) that it had found half a dozen items of malware on my system; - generally made a nuisance of itself by grabbing focus with dialogue boxes (this seemed odd - my browser settings forbid Javascript to raise or lower windows, yet my main browser window was, to all intents and purposes, irreversibly lowered by the presence of the dialogue boxes, and the only browser actions possible were to click on dialogue box buttons or do a window-manager close on the dialogue box) - did a passable impersonation of Windows Update (or at least, it would have been passable if the system I was looking at it with had been running Windows ;-)); and - finished up by offering me a download of an executable Windows binary, which I rejected. I took a look at the Javascript source code, but it was _very_ obfuscated. My question is - could the script have got any sort of access to my local filesystems or otherwise done any damage? -- Thanks, Dan

3 3

Copy files and change case - any ready made utliities around?
by Chris G 06 Sep '10

06 Sep '10

I want to keep two directories in sync but with a slight difference, I want the 'destination' directory to have lower case names only. I.e. any file in the source directory that has an upper case name (or any upper case characters in its name) I want copied to the destination directory with a lower case name. I guess I can come up with solutions that need me to write a wrapper script of some sort for rsync but I was wondering if anyone has any ideas for a ready made solution. This needs to be run as a cron job by the way. -- Chris Green

5 7

NAS Drive mounting help
by steve-ALUG＠hst.me.uk 06 Sep '10

06 Sep '10

Hi Gurus! I've been given a Netgear SC101 which I'm intending to use for backups. I found a post somewhere about how to mount it, and I have mounted it, or at least I thought I had until I rebooted and it was no-longer mounted. The steps I have to take are: sudo modprobe nbd sudo ut listall sudo ut attach {DRIVE_ID_FROM_LISTALL} /dev/nbd0 sudo mount -t ext4 /mnt/sc101 /dev/nbd0 Line 1 adds a device driver to the kernel line 2 finds the drive's "id". You only need to run this once - the ID doesn't change line 3 "attaches" the drive to the system. line 4 mounts the block device at my chosen mount point. I've added a line to FSTab to take care of line 4, but the problem is, I seem to need to do line 1 and line 3 after a reboot before I can mount it. Q1: How can I make a modprobe "stick" to survive a reboot? Q2: Where should I execute line 3? Q3: Should I should manually mount there too, rather than using FSTab? I'm attempting to use BackupPC to backup my files. This runs as a service, and requires that drive to be running to start. Q4: Is there a way to conditionally start a service, dependant on whether the drive is present or not, or should I just let it attempt to auto-start and live with it failing if the drive's not there? Any help much appreciated! BTW, the reason I'm attempting to use BackupPC is because it "folds" identical files from multiple PCs into 1, i.e. it doesn't store multiple copies - i.e. it de-duplicates the backup, hopefully allowing me to backup multiple machines without buying loads of disks! Cheers Steve

4 14

What keeps creating files called '%1'?
by Chris G 04 Sep '10

04 Sep '10

Something keeps creating a file called %1 on my system, has anyone else had this happening and, if so, do they know what's doing it? -- Chris Green

2 3