diff --git a/handbook/troggle/troglaptop.html b/handbook/troggle/troglaptop.html index 97abd664b..5700b625a 100644 --- a/handbook/troggle/troglaptop.html +++ b/handbook/troggle/troglaptop.html @@ -32,28 +32,30 @@ need to write any new software for what you need to do. Look at the tools and re

Short-cut

If you have never done any bulk updates, and don't understand git, but want to look at the code and maybe run it, then there is a shortcut. You do not actually need to do all the Bulk Update machine configuration first.

You can download the code without having a key-pair like this: -

$ mkdir ~/expo
-$ cd ~/expo
-$ git clone http://expo.survex.com/repositories/troggle/.git
- This will create ~/expo/troggle/ and get you a copy of the configuration scripts +
mkdir ~/expo
+cd ~/expo
+git clone http://expo.survex.com/repositories/troggle/.git trog-temp
+ This will create ~/expo/trog-temp/ and get you a copy of the configuration scripts but you need to make them executable before they will work: - 
$ cd ~/expo/troggle
-cp _deploy/wsl/*.sh .
-$ chmod +x *.sh
- Now go to scripts + 
mv ~/expo/trog-temp/_deploy/wsl/*.sh ~/expo
+cd ~/expo
+chmod +x *.sh
+rm -fr trog-temp
+ Now go to scripts.
[ Yes + it's a pain having to clone the whole repo just to get only 4 scripts. But getting a repo in this way gets it in a config that means you can't work with it (maybe a git nerd can edit this page to tell us how to do that). We have to clone it properly using ssh to do that . Alternatively you can get the first script by cutting and pasting from the webpage at expo.survex.com/repositories/troggle/.git/tree/_deploy/wsl/os-trog24.04.sh ]

Read more here..

This page is a work in progess. Text will be moved here from 

-http://expo.survex.com/repositories/troggle/.git/tree/README.txt
+expo.survex.com/repositories/troggle/.git/tree/README
debian logo @@ -114,23 +116,28 @@ provisioning so that systems are rebuilt cleanly. Configuring ubuntu +

Set up the key-exchange first. You need to be able to ssh into the server to run this next bit. +

In your home folder run
~$ bash os-trog24.04.sh -
copy it from the .git repo online to get hold of it. Run it in /home/username and it will create a folder expo and clone all the repositories into it after installing the software you need. It installs some of expofiles but not expofiles/photos/. +
you will hve this in your troggle folder is you have copied it from _deploy (see instructions above) or you can copy it from the .git repo online to get hold of it. Run it in /home/username/expo and it will clone all the repositories into it after installing the software you need. It installs some of expofiles but not expofiles/photos/.

key exchange

-

You need this so that you can upload your edited code to the git repo on the server. +

You absolutely need this so that you can upload your edited code to the git repo on the server. And currently the initial download and setup requires it too.

Follow this link to register a key with the expo server to get git access if you have not already cloned the :troggle: repo.

Set your indentity

On a new machine you need to configure your git identity: - 

git config --global user.email "you@example.com"
-git config --global user.name "Your Name"
+  
git config --global user.email "anathema.device@example.com"
+git config --global user.name "Anathema Device"
 git config --global pull.rebase true
 

 
-
+
On WSL you will need to check that the key that you paired is actually loaded:
chmod 700 ~/.ssh/*
+eval `ssh-agent`
+ssh-add ~/.ssh/anathema@device

+  
 
 
Remote EXPOFILES

 
If you do not have a local copy of the 40GB /expofiles/, don't worry. Later on we can set 'EXPOFILESREMOTE = True' in the