src/skynet/services/skynet.md

@@ -11,8 +11,64 @@ You can find more of the history here: <https://2009.skynet.ie/history.html>
 ## Login
 Login is done via ssh and ssh keys.
 
-## SSH Keys
-[See the tutorial on SSH keys for more info](../../tutorials/skynet/create_ssh.md)
+### Create SSH key
+First we set up the ssh folder and create a skynet folder within it for neatness
+```bash
+mkdir -f -p ~/.ssh/skynet
+cd ~/.ssh/skynet
+```
+Now we will create the ssh key itself.  
+Location: ``username``, your skynet username.  
+Password: Press Enter twice for no password on the key.  
+```bash
+ssh-keygen -t ed25519 -C "<comment>"
+```
+It will create two files: ``username`` and ``username.pub``
+
+### SSH Key
+Head over to [adding ssh keys](./account.md#ssh-keys) to find information on adding ssh keys to your skynet account.
+
+it is the ``username.pub`` that you will be adding to your account.  
+To get the contents of the file do this.
+```bash
+cat username.pub
+```
+
+### SSH Config
+Back up to the ``.ssh`` folder.
+```bash
+cd ../
+```
+
+Now we have to create the config file.  
+Notice how it has no extension.
+#### Windows
+```powershell
+"" > config
+```
+Open it up in any text editor available to you.
+
+#### Linux
+```bash
+touch config
+```
+You can edit it from command line using nano 
+
+```bash
+nano config
+```
+Or open up in a text editor.
+
+
+--------------------------------------
+
+Windows and Linux pop this into the file and save it
+```
+Host *.skynet.ie
+   User %r
+   IdentityFile ~/.ssh/skynet/%r
+   IdentitiesOnly yes
+```
 
 ### Logging in
 In any terminal do this:
@@ -23,4 +79,16 @@ ssh username@skynet.skynet.ie
 And you will be in!
 
 ## Website
-[See the tutorial on the website for more info](../../tutorials/skynet/create_website.md)
+In your home folder follow these commands to create the folder that can be used to host a website
+
+```bash
+mkdir ~/public_html 
+chmod 711 ~
+chmod -R 755 ~/public_html
+cd ~/public_html 
+```
+
+See below for an easy way to upload files to this folder.
+
+## More info
+There is a slideshow that might be of use to you: <https://public.skynet.ie/slides/skynet/1_setup.html>

src/tutorials/skynet/create_ssh.md

@@ -1,88 +0,0 @@
-# Setup SSH Keys
-
-To be able to gain remote access to the Skynet.
-
-``$USERNAME`` Refers to your Skynet username, for example I would replace ``$USERNAME`` with ``silver``
-
-## Create Key
-First we set up the ssh folder and create a skynet folder within it for neatness
-                
-```bash
-mkdir -f -p ~/.ssh/skynet
-cd ~/.ssh/skynet
-```
-
-Now we will create the ssh key itself.  
-Location: ``$USERNAME``, your skynet username.  
-Password: Press Enter twice for no password on the key.  
-
-```bash
-ssh-keygen -t ed25519 -C "<comment>"
-```
-It will create two files: ``$USERNAME`` and ``$USERNAME.pub`` inside ``~/.ssh/skynet``
-
-### Linux Only
-Openssh will complain if the keys permissions are too permissive.  
-To fix this use
-
-```bash
-chmod 600 $USERNAME
-# or
-chmod 600 ~/.ssh/skynet/$USERNAME
-```
-
-
-## Create Config
-Above we created a folder for Skynet keys.  
-Ye can do the same with Gitlab/Github/... in the future.  
-The only downside is that we now have to tell ssh what key to use in what situation.  
-
-
-Back up to the ``.ssh`` folder.
-```bash
-cd ../
-# or
-cd ~/.ssh
-```
-
-Now we have to create the config file.  
-Notice how it has no extension.
-
-
-### Windows
-```powershell
-"" > config
-```
-Open it up in any text editor available to you.
-
-### Linux
-```bash
-touch config
-```
-You can edit it from command line using nano
-
-```bash
-nano config
-```
-Or open up in a text editor.
-
-### Windows/Linux
-This is what we want to have in teh file.
-```
-Host *.skynet.ie
-   User $USERNAME
-   IdentityFile ~/.ssh/skynet/$USERNAME
-   IdentitiesOnly yes
-```
-
-
-
-
-## Add key to account
-Go to [the modify SSH page](https://account.skynet.ie/modify_ssh) and paste in teh contents of ``$USERNAME.pub``.
-
-You will now be able to SSH into Skynet like so:
-
-```bash
-ssh $USERNAME@skynet.skynet.ie
-```

src/tutorials/skynet/create_website.md

@@ -1,26 +0,0 @@
-# Create your own website on Skynet
-
-## Login
-Once ye have [logged in](./create_ssh.md) you will be able to create a website on Skynet.
-
-## Website
-### Manually
-
-In your home folder follow these commands to create the folder that can be used to host a website
-
-```bash
-mkdir ~/public_html 
-chmod 711 ~
-chmod -R 755 ~/public_html
-cd ~/public_html 
-```
-
-To transfer files graphically you can use these programs:
-* WinSCP
-* FileZilla
-
-Anything put there will be accessible under ``https://$USERNAME.users.skynet.ie``.  
-For backwards compatability ``https://skynet.ie/~$USERNAME`` will redirect to ``https://$USERNAME.users.skynet.ie``.
-
-## More info
-There is a slideshow that might be of use to you: <https://public.skynet.ie/slides/skynet/1_setup.html>