diff --git a/content/getting-started/nas.md b/content/getting-started/nas.md index 650fbf8..cfb59e0 100644 --- a/content/getting-started/nas.md +++ b/content/getting-started/nas.md @@ -3,7 +3,7 @@ Date: 2018-7-25 Tags: NAS, diy, vpn Slug: network-backups-over-vpn Description: How to set up a spare olimex board as a networked backup disk - +Status: draft #Introduction @@ -13,16 +13,16 @@ This particular set up will be connected via the homerouter of the author's pare ## Hardware involved -![Image of an Olimex Lime A10](/images/nas_a10_olimex.JPG) +![Image of an Olimex Lime A10](images/nas/nas_a10_olimex.JPG) * Olimex Lime A10 512mb ram, 1 core Fairly limited resources but like all olimex boards it has support for SATA disks and Li-Po batteries The distro used is [Armbian](https://www.armbian.com/olimex-lime-a10/), unfortunately it is not supported beyond Debian Jessie anymore. -![Image of a 2.5" HDD and a micro SD card](/images/nas_storage_media.JPG) +![Image of a 2.5" HDD and a micro SD card](images/nas/nas_storage_media.JPG) * Class 10 Micro SD card that has a capacity of at least 4GB * 2TB Hard Disk, 2.5" inch model that fits in laptops -![SATA Connecting cables ](/images/nas_sata_cables.JPG) +![SATA Connecting cables ](images/nas/nas_sata_cables.JPG) * A SATA Cable and a SATA-PWR cable, the SATAP-PWR cable needs a JST connector on one end. This can be easily DIY'd or purchased [via the Olimex website](https://www.olimex.com/Products/Components/Cables/SATA-CABLE-SET/) * Powersupply that is able to feed both (5v, 1.2Ah). * Access to a router and a ethernet cable diff --git a/content/getting-started/basics_port_forwarding.md b/content/getting-started/port_forwarding.md similarity index 91% rename from content/getting-started/basics_port_forwarding.md rename to content/getting-started/port_forwarding.md index dfe77cd..83fc32e 100644 --- a/content/getting-started/basics_port_forwarding.md +++ b/content/getting-started/port_forwarding.md @@ -1,10 +1,10 @@ -Title: HBSC Basics: setting up Port Forwarding on your home router +Title: Setting up port forwarding on your home router Date: 2019-01-14 -Tags: port forwarding, router, introduction, lan, wan -Slug: basics-port-forwarding +Tags: port-forwarding, router +Slug: port-forwarding Description: How to set up a spare computer as a server and make it reachable over the internet. Author: hbsc & friends - +Status: draft # UNDER CONSTRUCTION @@ -28,7 +28,7 @@ To begin serving from home you need the following: ## Port forwarding theory -![A schematic representation depicting network address translation between a LAN and WAN](images/port_forwarding.svg) A schematic representation depicting network address translation between a local area network and a wide area network, where ports are being forwarded from the WAN to home server on the LAN. The IP-addresses indicated in this schematic are used throught the article as for reference but might differ from your own situation. +![A schematic representation depicting network address translation between a LAN and WAN](images/port-forwarding/port_forwarding.svg) A schematic representation depicting network address translation between a local area network and a wide area network, where ports are being forwarded from the WAN to home server on the LAN. The IP-addresses indicated in this schematic are used throught the article as for reference but might differ from your own situation. Most home routers are configured by default to make the devices behind your router inaccessible to the internet using their inbuilt firewall. This is to prevent your private network from being public. @@ -90,10 +90,6 @@ Next try to find an option called "Static (DHCP) Lease" or "DHCP Binding" or som Once you've set up a static lease to your homeserver you can start port forwarding. Depending on the make of the router it can be called Port Sharing or Traffic Forwarding and can usually be found in a section of the router admin interface dealing with 'security' or 'internet'. - - - - ## Additional Resources * [https://portforward.com/](https://portforward.com/router.htm) has a large list of routers and visual instructions on how to set up port forwarding on them. diff --git a/content/instant-messaging/set_up_an_xmpp_messenger.md b/content/instant-messaging/set_up_an_xmpp_messenger.md index dd67945..ac5f340 100644 --- a/content/instant-messaging/set_up_an_xmpp_messenger.md +++ b/content/instant-messaging/set_up_an_xmpp_messenger.md @@ -82,11 +82,11 @@ To start a chat you need to add another Jabber friend under the '+' in the menu So let’s activate OMEMO encryption by pressing the padlock in the top menu bar: -![selecting OMEMO encryption]({static}images/conv_1.png) +![selecting OMEMO encryption](images/xmpp-msgr/conv_1.png) OMEMO is an extension to XMPP for multi-client end-to-end encryption. OMEMO only works if the fingerprint of your and your friend’s device match. To compare them, open one of your conversations and click on your profile picture next to one of your messages. At the same time, your friend clicks on your icon on his phone. -![Checking fingerprints]({static}images/conv_2.png) +![Checking fingerprints](images/xmpp-msgr/conv_2.png) Now, both of you should see a fingerprint that you can check. If they match, change the slider as you see in the screenshot to the right. @@ -94,22 +94,22 @@ If OMEMO cannot be activated, just send a message in the chat window. This somet After you activated OMEMO, the input field at the bottom should say you can now send encrypted messages: -![The shield or padlock indicates an encrypted message]({static}images/conv_3.png) +![The shield or padlock indicates an encrypted message](images/xmpp-msgr/conv_3.png) Troubleshooting Conversations --- If OMEMO cannot be activated, just send a message in the chat window. This sometimes helps. Also, it may help to end a conversation by pressing the menu on the top right inside a conversation as shown in the following screenshot, and then re-open the conversation again. -![Ending a conversation]({static}images/conv_4.png) +![Ending a conversation](images/xmpp-msgr/conv_4.png) Allow presence updates, this is used by OMEMO to exchange keys: In a conversation, click on the icon/image of your chat partner. In the new screen (as shown below), make sure that all checkboxes are activated: -![Make sure you allow presence updates so your client can exchange OMEMO keys]({static}images/conv_5.png) +![Make sure you allow presence updates so your client can exchange OMEMO keys](images/xmpp-msgr/conv_5.png) Check fingerprints: You might be asked to trust fingerprints like this: -![Checking fingerprints]({static}images/conv_2.png) +![Checking fingerprints](images/xmpp-msgr/conv_2.png) If you run into problems try asking for help in the Conversations XMPP groupchat: [conversations@conference.siacs.eu](xmpp:conversations@conference.siacs.eu?join) @@ -124,32 +124,32 @@ Get ChatSecure from the AppStore. `¯\_(ツ)_/¯` Choose whether to create a new account or login with an existing one: -![Initial screen: create or add account]({static}images/cs_1.png) > ![Select XMPP]({static}images/cs_2.png) > ![The login screen]({static}images/cs_3.png) +![Initial screen: create or add account](images/xmpp-msgr/cs_1.png) > ![Select XMPP](images/xmpp-msgr/cs_2.png) > ![The login screen](images/xmpp-msgr/cs_3.png) If you already have an XMPP account, you can log in with your username@hostname and password. After you selected "Add Existing Account" you have the option to connect with "XMPP" or with "Google Talk". Select "XMPP" and fill in your Nickname, Username (username@server.net) and password. Optionally fill in the Hostname of your XMPP server and select if you want to use Tor or not. If you're doubting about the port, 5222 is the default XMPP port and would likely be on your server as well. **Enabling Push** -![Considering using push]({static}images/cs_4.png) +![Considering using push](images/xmpp-msgr/cs_4.png) After you've logged in, the app proposes to establishe secure connections by sending an empty message to offline contacts. You have the option to "Enable push" or "skip" this part. iOS typically end the connection when an app runs in the background and requires use of Apple's Push servers to wake up and receive a message. By sending empty messages ChatSecure limits the data being sent to the Apple Cloud's Push Server but obviously still provide their vertically integrated cloud platform with meta-data. Read more about the Push issues [here](https://chatsecure.org/blog/chatsecure-v32-push/) and [here](https://chatsecure.org/blog/fixing-the-xmpp-push-problem/) In the next screen you can "Share invite" (let people on social media know about the app) or tap the '✓' symbol in the top right corner to continue. This takes you to the general 'Settings' menu. -![Invite others to use ChatSecure]({static}images/cs_5.png) > ![Settings]({static}images/cs_6.png) > ![Logging out]({static}images/cs_7.png) +![Invite others to use ChatSecure](images/xmpp-msgr/cs_5.png) > ![Settings](images/xmpp-msgr/cs_6.png) > ![Logging out](images/xmpp-msgr/cs_7.png) If you are successfully connected, the word "Connected" appears right under your username. Before you can edit your account settings, you need to log out. To do this, click your account/nickname in the settings menu and select "Log Out". **Create New Account** -![advanced options]({static}images/cs_8.png) > ![advanced options]({static}images/cs_9.png) > ![server options]({static}images/cs_10.png) +![advanced options](images/xmpp-msgr/cs_8.png) > ![advanced options](images/xmpp-msgr/cs_9.png) > ![server options](images/xmpp-msgr/cs_10.png) Choose "Create New Account" and give your preferred nickname. Under "show advanced options" you can customize your username, generate an automatic password, enable TOR (we didn't test it) and select a server where you would like to register your account on. This is the server you will use to communicate with other people's selected servers, and depending on the server settings it will also store your (encrypted) messages. ChatSecure let's you choose between 3 built-in servers options. Default is DuckDuckGo, but when you tap on "DuckDuckGo" the app will take you to the server selection screen where you can choose between DuckDuckGo, Calyxinstitute.org and OTR.im[ref]All three of these servers score poorly on the modern XMPP [compliance test](https://gultsch.de/compliance.html)[/ref], it also offers you the option to select another, custom, server. Here you can fill in the hostname of the XMPP server of a friend. **Adding contacts** -![server options]({static}images/cs_13.png) > ![server options]({static}images/cs_14.png) > ![friend request]({static}images/cs_15.png) +![server options](images/xmpp-msgr/cs_13.png) > ![server options](images/xmpp-msgr/cs_14.png) > ![friend request](images/xmpp-msgr/cs_15.png) From the settings menu, tap 'Chats' (top left) to start chatting and adding friends. To add friends tap the 'Compose' icon, top left corner. Then tap "Add Buddy" and fill in your friends username and hostname (username@hostname) or scan their QR code. @@ -162,13 +162,13 @@ If you get a friend request, their nickname will appear in the "Chats" list. When in a chat, tap the information icon on the top right (i) to change your encryption settings. The information menu displays your current and past verified fingerprints and allows you to specify an encryption method by tapping "Show Advanced Encryption Sett...". -![friend request]({static}images/cs_16.png) > ![friend request]({static}images/cs_17.png) > ![friend request]({static}images/cs_18.png) +![friend request](images/xmpp-msgr/cs_16.png) > ![friend request](images/xmpp-msgr/cs_17.png) > ![friend request](images/xmpp-msgr/cs_18.png) At the time of writing OMEMO works well with other OMEMO clients, images shared over HTTPUpload however are not displayed inline but rather as a URL. If you click that your browser will open it and fail to decrypt the OMEMO encoded image, because it has no notion of your OMEMO fingerprints. So for now the images shared over HTTPUpload have to be shared using plaintext. ChatSecure implements OMEMO and OTR on a TOFU or “trust on first use" basis. New "buddies" are automatically trusted. -![friend request]({static}images/cs_18.png) > ![friend request]({static}images/cs_19.png) +![friend request](images/xmpp-msgr/cs_18.png) > ![friend request](images/xmpp-msgr/cs_19.png) You can also untrust your friends devices/fingerprints by sliding the green "Verified" button and share fingerprints by tapping them and selecting a medium to share your fingerprint over. @@ -231,7 +231,7 @@ And now for OMEMO! There is a package gajim-omemo on Debian Backports. So run: Next, start Gajim. After Gajim has started, wait some seconds until it requests your permission to install updates: -![Allow Gajim to update itself]({static}images/gajim_1.png) +![Allow Gajim to update itself](images/xmpp-msgr/gajim_1.png) Allow this. Afterwards, a new window will open that lists all components that can be installed and updated. In this list, activate the checkbox next to the following plugins: @@ -251,7 +251,7 @@ After the update has finished, go to the other tab **Installed**. There, make su Then, you should see a wizard to setup your XMPP account. Select the option that you already have an account and follow all instructions yourself using the default settings. -![Gajim account creation wizard]({static}images/gajim_2.png) +![Gajim account creation wizard](images/xmpp-msgr/gajim_2.png) After you finished the wizard successfully, Gajim will show your status as **Available**. Congratulations! @@ -259,13 +259,13 @@ Now, let’s send messages to your friends. To do so, click on the Gajim window and move your mouse to the top of the screen. There, a menu should appear. Go to Actions -> Start chat… . In the new window, add the XMPP ID of your friend and click ok. -![Adding contacts]({static}images/gajim_3.png) +![Adding contacts](images/xmpp-msgr/gajim_3.png) Go to the main menu again and select **View -> Show offline contacts…** . In the Gajim window, you should see your friend. Right click on the name of your friend and select **Manage contact -> Add to roster.** In the pop up, just click **Add**. Now your friend is permanently added to your list of contacts. Next, right click on your friend and select **Manage contact -> Allow subscription -> Allow contact to see my status**. Your friend should see a request like this: -![Friend request]({static}images/gajim_4.png) +![Friend request](images/xmpp-msgr/gajim_4.png) Your friend should click **Authorize**, which enables her to see if you are online or not. Also, this step is necessary for activating the encryption. @@ -273,7 +273,7 @@ Next, make sure that your friend also allows you to see her status. Now, when you open the chat window to your friend, it should say OMEMO encryption enabled and show a red shield next to the input field, like this: -![Omemo enabled]({static}images/gajim_5.png) +![Omemo enabled](images/xmpp-msgr/gajim_5.png) If you don’t see the OMEMO encryption enabled — just restart Gajim and have a look again. @@ -290,7 +290,7 @@ She should chose the tab Own devices, while you chose the tab Contact. Now, sele Finally, all fingerprints should be green like this: -![Omemo enabled]({static}images/gajim_6.png) +![Omemo enabled](images/xmpp-msgr/gajim_6.png) **Troubleshooting** diff --git a/content/lowtech/solar.lowtech.md b/content/lowtech/solar.lowtech.md index 1c1f140..e92fe72 100644 --- a/content/lowtech/solar.lowtech.md +++ b/content/lowtech/solar.lowtech.md @@ -37,21 +37,21 @@ You can find the source code for 'solar', the Pelican theme we developed [here]( One of the main challenges was to reduce the overall size of the website. Particularly to try and reduce the size of each page to something less than 1MB . Since a large part of both the appeal and the weight of the magazine comes from the fact it is richly illustrated, this presented us with a particular challenge. -![Image from the blog showing 19th century telephone switchboard operators, 159.5KB](/images/international-switchboard.jpg)Image from the blog showing 20th century telephone switchboard operators([original source](https://commons.wikimedia.org/wiki/File:Bell_System_switchboard.jpg)), 159.5KB +![Image from the blog showing 19th century telephone switchboard operators, 159.5KB](images/lowtech-solar/international-switchboard.jpg)Image from the blog showing 20th century telephone switchboard operators([original source](https://commons.wikimedia.org/wiki/File:Bell_System_switchboard.jpg)), 159.5KB In order to reduce the size of the images, without diminishing their role in the design and the blog itself, we reverted to a technique called dithering: -![The same image but dithered with a 3 color palette](/images/international-switchboard3.png)The same image but dithered with a 3 color palette, 36.5KB +![The same image but dithered with a 3 color palette](images/lowtech-solar/international-switchboard3.png)The same image but dithered with a 3 color palette, 36.5KB This is a technique 'to create the illusion of "color depth" in images with a limited color palette'[^illusion]. It based on the print reproduction technique called [halftoning](https://en.wikipedia.org/wiki/Halftone). Dithering, or digital half-toning[^digitalhalftone], was widely used in video games and pixel art at a time when a limited amount of video memory constrained the available colors. In essence dithering relies on optical illusions to simulate more colors. These optical illusions are broken however by the distinct and visible patterns that the dithering algorithms generate. -![Dithered with a six tone palette](/images/international-switchboard6.png)Dithered with a six tone palette, 76KB +![Dithered with a six tone palette](images/lowtech-solar/international-switchboard6.png)Dithered with a six tone palette, 76KB As a consequence most of the effort and literature on dithering is around limiting the 'banding' or visual artifacts by employing increasingly complex dithering algorithms[^dithering]. Our design instead celebrates the visible patterns introduced by the technique, this to stress the fact that it is a 'different' website. Coincidentally, the 'Bayesian Ordered Dithering' algorithm that we use not only introduces these distinct visible patterns, but it is also quite a simple and fast algorithm. -![Dithered with an eleven tone color palette](/images/international-switchboard11.png)Dithered with an eleven tone palette, 110KB +![Dithered with an eleven tone color palette](images/lowtech-solar/international-switchboard11.png)Dithered with an eleven tone palette, 110KB We chose dithering not only for the compression but also for the aesthetic and reading experience. Converting the images to grayscale and then dithering them allows us to scale them in a visually attractive way to 100% of the view port, despite their small sizes. This gives each article a visual consistency and provides the reader with pauses in the long articles. @@ -73,7 +73,7 @@ Increasing the uptime of the server to 99% on solar energy means increasing the Rather than that we opted for a low-tech approach that accepts being off-line during longer stretches of cloudy weather. However, we wanted to provide the reader with off-line reading options. Our primary method of doing so currently is by providing an [RSS feed containing all the articles and images on the site](https://solar.lowtechmagazine.com/feeds/all.rss.xml). In the future we will explore other means of providing off-line reading of the magazine. -![An image of the built-in feed reader of Firefox showing solar.lowtechmagazine.com's RSS feed](/images/off-line-reading.png) Most browsers preview only the article titles and summaries of the RSS feed. In fact the feed contains the full articles. Once you add the feed to your favorite reader, it will download the full articles that you can read at any given time. +![An image of the built-in feed reader of Firefox showing solar.lowtechmagazine.com's RSS feed](images/lowtech-solar/off-line-reading.png) Most browsers preview only the article titles and summaries of the RSS feed. In fact the feed contains the full articles. Once you add the feed to your favorite reader, it will download the full articles that you can read at any given time. ## Material Server @@ -397,7 +397,7 @@ Without further ado: # Hardware -![Image of an A20 Olimex SoC board](/images/lime2.png) +![Image of an A20 Olimex SoC board](images/lowtech-solar/lime2.png) ### Server The server itself is an [Olimex Olinuxino A20 Lime 2](https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXino-LIME2/) single board computer. @@ -410,7 +410,7 @@ In addition to the power statistics the power chip can charge and discharge a Li The server operating system all runs on an SD-card. Not only are these low-powered but also much faster than hard drives. We use high speed Class 10 16GB mirco-sd card. A 16GB card is actually a bit of an overkill considering the operating system is around 1GB and the website a mere 30MB, but considering the price it doesn't make sense to buy any smaller high-performance cards. -![](/images/sps_close.png) +![SPS Close](images/lowtech-solar/sps_close.png) ### Network diff --git a/content/pages/about.md b/content/pages/about.md index 5a4d07c..173ebf1 100644 --- a/content/pages/about.md +++ b/content/pages/about.md @@ -1,5 +1,5 @@ Title: About -Date: 2016-04-10 +Date: 2016-04-10 Category: info Subcategory: about Tags: homebrewserver @@ -7,14 +7,14 @@ Slug: about -A monthly gathering for those who (wish to) host their own online services from home, rather than using commercial and privacy unfriendly alternatives. Together we config and work on our homebrew server setups. These are low-cost, low-power, low-maintenance, high-fun computers through which we can host all of our online necessities and keep them out of the cloud. The club meetings are open for anyone, from more experienced users to interested beginners. During the homebrewserver.club meetings we exchange tips or look into particular topics together. As we gain more knowledge about a topic, we write and publish guides for others to share. +A monthly gathering for those who (wish to) host their own online services from home, rather than using commercial and privacy unfriendly alternatives. Together we config and work on our homebrew server setups. These are low-cost, low-power, low-maintenance, high-fun computers through which we can host all of our online necessities and keep them out of the cloud. The club meetings are open for anyone, from more experienced users to interested beginners. During the homebrewserver.club meetings we exchange tips or look into particular topics together. As we gain more knowledge about a topic, we write and publish guides for others to share. If you have questions or would like to join check out our [mailinglist](https://we.lurk.org/postorius/lists/hbsc.we.lurk.org/) or join us in our [XMPP chatroom](xmpp:hbsc@muc.lurk.org?join) -Unless otherwise specified, all the material on this website is published under a [Attribution-ShareAlike 4.0 International license](http://creativecommons.org/licenses/by-sa/4.0/). +Unless otherwise specified, all the material on this website is published under a [Attribution-ShareAlike 4.0 International license](http://creativecommons.org/licenses/by-sa/4.0/). -![CC]({static}../images/chooser_cc.png) ![BY]({static}../images/chooser_by.png) -![SA]({static}../images/chooser_sa.png) +![CC](images/about/chooser_cc.png) ![BY](images/about/chooser_by.png) +![SA](images/about/chooser_sa.png) -![winning!]({static}../images/seal_of_freedom.png) +![winning!](images/about/seal_of_freedom.png) diff --git a/content/staticfiles/downloads/prosody.0.11.cfg.lua b/content/staticfiles/configs/prosody/prosody.0.11.cfg.lua similarity index 100% rename from content/staticfiles/downloads/prosody.0.11.cfg.lua rename to content/staticfiles/configs/prosody/prosody.0.11.cfg.lua diff --git a/content/staticfiles/downloads/prosody.0.9.cfg.lua b/content/staticfiles/configs/prosody/prosody.0.9.cfg.lua similarity index 100% rename from content/staticfiles/downloads/prosody.0.9.cfg.lua rename to content/staticfiles/configs/prosody/prosody.0.9.cfg.lua diff --git a/content/staticfiles/downloads/prosody.10.cfg.lua b/content/staticfiles/configs/prosody/prosody.10.cfg.lua similarity index 100% rename from content/staticfiles/downloads/prosody.10.cfg.lua rename to content/staticfiles/configs/prosody/prosody.10.cfg.lua diff --git a/content/staticfiles/extra/favicon.ico b/content/staticfiles/configs/site/favicon.ico similarity index 100% rename from content/staticfiles/extra/favicon.ico rename to content/staticfiles/configs/site/favicon.ico diff --git a/content/staticfiles/extra/robots.txt b/content/staticfiles/configs/site/robots.txt similarity index 100% rename from content/staticfiles/extra/robots.txt rename to content/staticfiles/configs/site/robots.txt diff --git a/content/staticfiles/images/chooser_by.png b/content/staticfiles/images/about/chooser_by.png similarity index 100% rename from content/staticfiles/images/chooser_by.png rename to content/staticfiles/images/about/chooser_by.png diff --git a/content/staticfiles/images/chooser_cc.png b/content/staticfiles/images/about/chooser_cc.png similarity index 100% rename from content/staticfiles/images/chooser_cc.png rename to content/staticfiles/images/about/chooser_cc.png diff --git a/content/staticfiles/images/chooser_sa.png b/content/staticfiles/images/about/chooser_sa.png similarity index 100% rename from content/staticfiles/images/chooser_sa.png rename to content/staticfiles/images/about/chooser_sa.png diff --git a/content/staticfiles/images/seal_of_freedom.png b/content/staticfiles/images/about/seal_of_freedom.png similarity index 100% rename from content/staticfiles/images/seal_of_freedom.png rename to content/staticfiles/images/about/seal_of_freedom.png diff --git a/content/staticfiles/images/favicon.ico b/content/staticfiles/images/favicon.ico deleted file mode 100644 index 3a89334..0000000 Binary files a/content/staticfiles/images/favicon.ico and /dev/null differ diff --git a/content/staticfiles/images/international-switchboard.jpg b/content/staticfiles/images/lowtech-solar/international-switchboard.jpg similarity index 100% rename from content/staticfiles/images/international-switchboard.jpg rename to content/staticfiles/images/lowtech-solar/international-switchboard.jpg diff --git a/content/staticfiles/images/international-switchboard11.png b/content/staticfiles/images/lowtech-solar/international-switchboard11.png similarity index 100% rename from content/staticfiles/images/international-switchboard11.png rename to content/staticfiles/images/lowtech-solar/international-switchboard11.png diff --git a/content/staticfiles/images/international-switchboard3.png b/content/staticfiles/images/lowtech-solar/international-switchboard3.png similarity index 100% rename from content/staticfiles/images/international-switchboard3.png rename to content/staticfiles/images/lowtech-solar/international-switchboard3.png diff --git a/content/staticfiles/images/international-switchboard6.png b/content/staticfiles/images/lowtech-solar/international-switchboard6.png similarity index 100% rename from content/staticfiles/images/international-switchboard6.png rename to content/staticfiles/images/lowtech-solar/international-switchboard6.png diff --git a/content/staticfiles/images/lime2.png b/content/staticfiles/images/lowtech-solar/lime2.png similarity index 100% rename from content/staticfiles/images/lime2.png rename to content/staticfiles/images/lowtech-solar/lime2.png diff --git a/content/staticfiles/images/off-line-reading.png b/content/staticfiles/images/lowtech-solar/off-line-reading.png similarity index 100% rename from content/staticfiles/images/off-line-reading.png rename to content/staticfiles/images/lowtech-solar/off-line-reading.png diff --git a/content/staticfiles/images/myimage.png b/content/staticfiles/images/myimage.png deleted file mode 100644 index 79aa1ce..0000000 Binary files a/content/staticfiles/images/myimage.png and /dev/null differ diff --git a/content/staticfiles/images/nas_a10_olimex.JPG b/content/staticfiles/images/nas/nas_a10_olimex.JPG similarity index 100% rename from content/staticfiles/images/nas_a10_olimex.JPG rename to content/staticfiles/images/nas/nas_a10_olimex.JPG diff --git a/content/staticfiles/images/nas_sata_cables.JPG b/content/staticfiles/images/nas/nas_sata_cables.JPG similarity index 100% rename from content/staticfiles/images/nas_sata_cables.JPG rename to content/staticfiles/images/nas/nas_sata_cables.JPG diff --git a/content/staticfiles/images/nas_storage_media.JPG b/content/staticfiles/images/nas/nas_storage_media.JPG similarity index 100% rename from content/staticfiles/images/nas_storage_media.JPG rename to content/staticfiles/images/nas/nas_storage_media.JPG diff --git a/content/staticfiles/images/sps_close.png b/content/staticfiles/images/nas/sps_close.png similarity index 100% rename from content/staticfiles/images/sps_close.png rename to content/staticfiles/images/nas/sps_close.png diff --git a/content/staticfiles/images/sps_panel.png b/content/staticfiles/images/nas/sps_panel.png similarity index 100% rename from content/staticfiles/images/sps_panel.png rename to content/staticfiles/images/nas/sps_panel.png diff --git a/content/staticfiles/images/sps_wide.png b/content/staticfiles/images/nas/sps_wide.png similarity index 100% rename from content/staticfiles/images/sps_wide.png rename to content/staticfiles/images/nas/sps_wide.png diff --git a/content/staticfiles/images/port_forwarding.svg b/content/staticfiles/images/port-forwarding/port_forwarding.svg similarity index 100% rename from content/staticfiles/images/port_forwarding.svg rename to content/staticfiles/images/port-forwarding/port_forwarding.svg diff --git a/content/staticfiles/extra/featured_image_blue.png b/content/staticfiles/images/syndication/featured_image_blue.png similarity index 100% rename from content/staticfiles/extra/featured_image_blue.png rename to content/staticfiles/images/syndication/featured_image_blue.png diff --git a/content/staticfiles/images/conv_1.png b/content/staticfiles/images/xmpp-msgr/conv_1.png similarity index 100% rename from content/staticfiles/images/conv_1.png rename to content/staticfiles/images/xmpp-msgr/conv_1.png diff --git a/content/staticfiles/images/conv_2.png b/content/staticfiles/images/xmpp-msgr/conv_2.png similarity index 100% rename from content/staticfiles/images/conv_2.png rename to content/staticfiles/images/xmpp-msgr/conv_2.png diff --git a/content/staticfiles/images/conv_3.png b/content/staticfiles/images/xmpp-msgr/conv_3.png similarity index 100% rename from content/staticfiles/images/conv_3.png rename to content/staticfiles/images/xmpp-msgr/conv_3.png diff --git a/content/staticfiles/images/conv_4.png b/content/staticfiles/images/xmpp-msgr/conv_4.png similarity index 100% rename from content/staticfiles/images/conv_4.png rename to content/staticfiles/images/xmpp-msgr/conv_4.png diff --git a/content/staticfiles/images/conv_5.png b/content/staticfiles/images/xmpp-msgr/conv_5.png similarity index 100% rename from content/staticfiles/images/conv_5.png rename to content/staticfiles/images/xmpp-msgr/conv_5.png diff --git a/content/staticfiles/images/cs_1.png b/content/staticfiles/images/xmpp-msgr/cs_1.png similarity index 100% rename from content/staticfiles/images/cs_1.png rename to content/staticfiles/images/xmpp-msgr/cs_1.png diff --git a/content/staticfiles/images/cs_10.png b/content/staticfiles/images/xmpp-msgr/cs_10.png similarity index 100% rename from content/staticfiles/images/cs_10.png rename to content/staticfiles/images/xmpp-msgr/cs_10.png diff --git a/content/staticfiles/images/cs_11.png b/content/staticfiles/images/xmpp-msgr/cs_11.png similarity index 100% rename from content/staticfiles/images/cs_11.png rename to content/staticfiles/images/xmpp-msgr/cs_11.png diff --git a/content/staticfiles/images/cs_12.png b/content/staticfiles/images/xmpp-msgr/cs_12.png similarity index 100% rename from content/staticfiles/images/cs_12.png rename to content/staticfiles/images/xmpp-msgr/cs_12.png diff --git a/content/staticfiles/images/cs_13.png b/content/staticfiles/images/xmpp-msgr/cs_13.png similarity index 100% rename from content/staticfiles/images/cs_13.png rename to content/staticfiles/images/xmpp-msgr/cs_13.png diff --git a/content/staticfiles/images/cs_14.png b/content/staticfiles/images/xmpp-msgr/cs_14.png similarity index 100% rename from content/staticfiles/images/cs_14.png rename to content/staticfiles/images/xmpp-msgr/cs_14.png diff --git a/content/staticfiles/images/cs_15.png b/content/staticfiles/images/xmpp-msgr/cs_15.png similarity index 100% rename from content/staticfiles/images/cs_15.png rename to content/staticfiles/images/xmpp-msgr/cs_15.png diff --git a/content/staticfiles/images/cs_16.png b/content/staticfiles/images/xmpp-msgr/cs_16.png similarity index 100% rename from content/staticfiles/images/cs_16.png rename to content/staticfiles/images/xmpp-msgr/cs_16.png diff --git a/content/staticfiles/images/cs_17.png b/content/staticfiles/images/xmpp-msgr/cs_17.png similarity index 100% rename from content/staticfiles/images/cs_17.png rename to content/staticfiles/images/xmpp-msgr/cs_17.png diff --git a/content/staticfiles/images/cs_18.png b/content/staticfiles/images/xmpp-msgr/cs_18.png similarity index 100% rename from content/staticfiles/images/cs_18.png rename to content/staticfiles/images/xmpp-msgr/cs_18.png diff --git a/content/staticfiles/images/cs_19.png b/content/staticfiles/images/xmpp-msgr/cs_19.png similarity index 100% rename from content/staticfiles/images/cs_19.png rename to content/staticfiles/images/xmpp-msgr/cs_19.png diff --git a/content/staticfiles/images/cs_2.png b/content/staticfiles/images/xmpp-msgr/cs_2.png similarity index 100% rename from content/staticfiles/images/cs_2.png rename to content/staticfiles/images/xmpp-msgr/cs_2.png diff --git a/content/staticfiles/images/cs_20.png b/content/staticfiles/images/xmpp-msgr/cs_20.png similarity index 100% rename from content/staticfiles/images/cs_20.png rename to content/staticfiles/images/xmpp-msgr/cs_20.png diff --git a/content/staticfiles/images/cs_3.png b/content/staticfiles/images/xmpp-msgr/cs_3.png similarity index 100% rename from content/staticfiles/images/cs_3.png rename to content/staticfiles/images/xmpp-msgr/cs_3.png diff --git a/content/staticfiles/images/cs_4.png b/content/staticfiles/images/xmpp-msgr/cs_4.png similarity index 100% rename from content/staticfiles/images/cs_4.png rename to content/staticfiles/images/xmpp-msgr/cs_4.png diff --git a/content/staticfiles/images/cs_5.png b/content/staticfiles/images/xmpp-msgr/cs_5.png similarity index 100% rename from content/staticfiles/images/cs_5.png rename to content/staticfiles/images/xmpp-msgr/cs_5.png diff --git a/content/staticfiles/images/cs_6.png b/content/staticfiles/images/xmpp-msgr/cs_6.png similarity index 100% rename from content/staticfiles/images/cs_6.png rename to content/staticfiles/images/xmpp-msgr/cs_6.png diff --git a/content/staticfiles/images/cs_7.png b/content/staticfiles/images/xmpp-msgr/cs_7.png similarity index 100% rename from content/staticfiles/images/cs_7.png rename to content/staticfiles/images/xmpp-msgr/cs_7.png diff --git a/content/staticfiles/images/cs_8.png b/content/staticfiles/images/xmpp-msgr/cs_8.png similarity index 100% rename from content/staticfiles/images/cs_8.png rename to content/staticfiles/images/xmpp-msgr/cs_8.png diff --git a/content/staticfiles/images/cs_9.png b/content/staticfiles/images/xmpp-msgr/cs_9.png similarity index 100% rename from content/staticfiles/images/cs_9.png rename to content/staticfiles/images/xmpp-msgr/cs_9.png diff --git a/content/staticfiles/images/gajim_1.png b/content/staticfiles/images/xmpp-msgr/gajim_1.png similarity index 100% rename from content/staticfiles/images/gajim_1.png rename to content/staticfiles/images/xmpp-msgr/gajim_1.png diff --git a/content/staticfiles/images/gajim_2.png b/content/staticfiles/images/xmpp-msgr/gajim_2.png similarity index 100% rename from content/staticfiles/images/gajim_2.png rename to content/staticfiles/images/xmpp-msgr/gajim_2.png diff --git a/content/staticfiles/images/gajim_3.png b/content/staticfiles/images/xmpp-msgr/gajim_3.png similarity index 100% rename from content/staticfiles/images/gajim_3.png rename to content/staticfiles/images/xmpp-msgr/gajim_3.png diff --git a/content/staticfiles/images/gajim_4.png b/content/staticfiles/images/xmpp-msgr/gajim_4.png similarity index 100% rename from content/staticfiles/images/gajim_4.png rename to content/staticfiles/images/xmpp-msgr/gajim_4.png diff --git a/content/staticfiles/images/gajim_5.png b/content/staticfiles/images/xmpp-msgr/gajim_5.png similarity index 100% rename from content/staticfiles/images/gajim_5.png rename to content/staticfiles/images/xmpp-msgr/gajim_5.png diff --git a/content/staticfiles/images/gajim_6.png b/content/staticfiles/images/xmpp-msgr/gajim_6.png similarity index 100% rename from content/staticfiles/images/gajim_6.png rename to content/staticfiles/images/xmpp-msgr/gajim_6.png diff --git a/content/staticfiles/extra/omemo.png b/content/staticfiles/images/xmpp-msgr/omemo.png similarity index 100% rename from content/staticfiles/extra/omemo.png rename to content/staticfiles/images/xmpp-msgr/omemo.png