diff --git a/wiki-hemera/config.yaml b/wiki-hemera/config.yaml
index 38e3f4c..1680225 100644
--- a/wiki-hemera/config.yaml
+++ b/wiki-hemera/config.yaml
@@ -8,7 +8,7 @@ copyright: MycoSystems
languages:
en:
languageName: English
- title: Hemera wiki pages
+ title: Hemera Wiki Pages
weight: 1
params:
description: HemeraLink and Hemera Network based on Netmaker
@@ -39,8 +39,8 @@ params:
lastUpdated: Jan 02, 2006 15:04 MST
sidebar:
- emoji: 🍥
- subtitle: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ emoji: ☀️
+ subtitle: HemeraLink and Hemera Network based on Netmaker
avatar:
enabled: true
local: true
diff --git a/wiki-hemera/content/categories/Test/_index.md b/wiki-hemera/content/categories/Test/_index.md
deleted file mode 100644
index de42112..0000000
--- a/wiki-hemera/content/categories/Test/_index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: "Test"
-description: "This is an example category"
-slug: "test"
-image: "hutomo-abrianto-l2jk-uxb1BY-unsplash.jpg"
-style:
- background: "#2a9d8f"
- color: "#fff"
----
diff --git a/wiki-hemera/content/categories/Test/hutomo-abrianto-l2jk-uxb1BY-unsplash.jpg b/wiki-hemera/content/categories/Test/hutomo-abrianto-l2jk-uxb1BY-unsplash.jpg
deleted file mode 100644
index c385943..0000000
Binary files a/wiki-hemera/content/categories/Test/hutomo-abrianto-l2jk-uxb1BY-unsplash.jpg and /dev/null differ
diff --git a/wiki-hemera/content/page/about/index.md b/wiki-hemera/content/page/about/index.md
index 494cb46..e1821ec 100644
--- a/wiki-hemera/content/page/about/index.md
+++ b/wiki-hemera/content/page/about/index.md
@@ -1,12 +1,11 @@
---
title: About
-description: Hugo, the world's fastest framework for building websites
-date: '2019-02-28'
+description: Decentralized computing for everyone.
+date: '2023-07-09'
aliases:
- about-us
- - about-hugo
+ - about-netmaker
- contact
-license: CC BY-NC-ND
lastmod: '2020-10-09'
menu:
main:
@@ -15,20 +14,45 @@ menu:
icon: user
---
-Written in Go, Hugo is an open source static site generator available under the [Apache Licence 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows.
+# Netmaker & Hemera Network
-Hugo makes use of a variety of open source projects including:
+### Intro
+___
+Netmaker is the core of Hemera Network and a pilot to test multiple "mesh" network management tools. Headscale and Zerotier were tested before and Netmaker came out on top for usability and core features.
-* https://github.com/yuin/goldmark
-* https://github.com/alecthomas/chroma
-* https://github.com/muesli/smartcrop
-* https://github.com/spf13/cobra
-* https://github.com/spf13/viper
+Other options currently on the todo list:
+- **OpenZiti (2019)** slightly more mature than Netmaker (2021), written in go, Apache-2.0 license.
+- **Webmesh (2023)** super new, written in go, Apache-2.0 license.
+___
-Hugo is ideal for blogs, corporate websites, creative portfolios, online magazines, single page applications or even a website with thousands of pages.
+### About The Project
+___
+**Overview:**
-Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases.
+The goal of Hemera is to be a test pilot for Hypnet and personal resource to allow me to connect my server infrastructure with others securely.
-Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider.
+**Hypenet:**
-Learn more and contribute on [GitHub](https://github.com/gohugoio).
+Hyperspace Network or Hypenet is a collective of hobbyists creating a set of guidelines for users to be able to connect and use decentralized systems and software.
+
+In practice this means providing a path for someone with extra compute resources to provide their services to an organization or person they would like the support.
+
+**Ex.** person A has 8 TB of unused disk space, person B has a computer sitting in the corner of their room collecting dust, and organization A has written out a proposal. They list requirements for storing secure offsite backups and a machine that can run Nextcloud or Jitsi. Person A & B have both already joined a Hypenet subnet and agree to provide, so the network manager changes the access control list to allow vetted hosts and virtual machines to connect to organization A's client and/or proxy.
+
+This then allows the origanization to get hardware and support from people who are willing to provide time and hardware on the network. This is encouraged to be done in a trade structure, but a monthly fee for using storage space or compute is allowed.
+___
+
+### About Netmaker
+___
+
+| Create | Manage | Automate |
+| - | - | - |
+| ✔️ WireGuard Networks | ✔️ Admin UI | ✔️ Linux |
+| ✔️ Remote Access Gateways | ✔️ OAuth | ✔️ FreeBSD |
+| ✔️ Mesh VPNs | ✔️ Private DNS | ✔️ Mac|
+| ✔️ Site-to-Site | ✔️ Access Control Lists | ✔️ Windows |
+https://github.com/gravitl/netmaker/
+
+#### Obligitory disclaimer and explaination
+Written in Go, Netmaker is a source-available tool for automating and managing wireguard VPNs, licensed under [SSPL](https://en.wikipedia.org/wiki/Server_Side_Public_License). Notes about SSPL and Netmaker, **SSPL is considered a "source-available" license and thus not "free software". Because, free software specifically defines software that you are allowed to do anything with, not just monetarily free, because SSPL limits how you are allowed to license applications dependant on Netmaker, it is not considered "free software". But, this does not cover software running on a netmaker subnet, you are free to use proprietary software or software licensed under any source-available/open-source license as long as it does not interact directly with Netmaker server or client applications. This does not apply to Wireguard client or server applications.**
+___
\ No newline at end of file
diff --git a/wiki-hemera/content/page/about/index.zh-cn.md b/wiki-hemera/content/page/about/index.zh-cn.md
deleted file mode 100644
index 0284003..0000000
--- a/wiki-hemera/content/page/about/index.zh-cn.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: 关于
-menu:
- main:
- weight: -90
- params:
- icon: user
----
-
-This is a test page for i18n support.
\ No newline at end of file
diff --git a/wiki-hemera/content/page/links/index.md b/wiki-hemera/content/page/links/index.md
index 9e29bf3..7801e32 100644
--- a/wiki-hemera/content/page/links/index.md
+++ b/wiki-hemera/content/page/links/index.md
@@ -1,37 +1,16 @@
---
title: Links
links:
- - title: GitHub
- description: GitHub is the world's largest software development platform.
- website: https://github.com
- image: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png
- - title: TypeScript
- description: TypeScript is a typed superset of JavaScript that compiles to plain JavaScript.
- website: https://www.typescriptlang.org
+ - title: Netmaker Website
+ description: "Connect everything With a WireGuard® VPN"
+ website: https://www.netmaker.io/
+ image: https://uploads-ssl.webflow.com/64149f8bba6c1301c5e75001/6418257c2c23ab2bb810ca86_with-p-800.webp
+ - title: Kleionode Git
+ description: Kleio is a node on the Hemera Network
+ website: https://git.myco.systems/kleionode
image: ts-logo-128.jpg
menu:
main:
weight: -50
params:
- icon: link
-
-comments: false
----
-
-To use this feature, add `links` section to frontmatter.
-
-This page's frontmatter:
-
-```yaml
-links:
- - title: GitHub
- description: GitHub is the world's largest software development platform.
- website: https://github.com
- image: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png
- - title: TypeScript
- description: TypeScript is a typed superset of JavaScript that compiles to plain JavaScript.
- website: https://www.typescriptlang.org
- image: ts-logo-128.jpg
-```
-
-`image` field accepts both local and external images.
\ No newline at end of file
+ icon: link
\ No newline at end of file
diff --git a/wiki-hemera/content/page/links/ts-logo-128.jpg b/wiki-hemera/content/page/links/ts-logo-128.jpg
deleted file mode 100644
index 85e3323..0000000
Binary files a/wiki-hemera/content/page/links/ts-logo-128.jpg and /dev/null differ
diff --git a/wiki-hemera/static/favicoin.ico b/wiki-hemera/static/favicon.ico
similarity index 100%
rename from wiki-hemera/static/favicoin.ico
rename to wiki-hemera/static/favicon.ico