diff --git a/config.toml b/config.toml index 3bb93c78..5dfe4e96 100644 --- a/config.toml +++ b/config.toml @@ -17,13 +17,13 @@ theme = "apsho" weight = 2 [[menu.main]] identifier = "description" - name = "Description" + name = "Federated Core" url = "/description" parent = "product" weight = 1 [[menu.main]] identifier = "comparison" - name = "Comparison" + name = "vs Competition" url = "/comparison" parent = "product" weight = 2 diff --git a/content/blog/introducing-federated-core.md b/content/blog/introducing-federated-core.md index 9ce29a70..2f051c8c 100644 --- a/content/blog/introducing-federated-core.md +++ b/content/blog/introducing-federated-core.md @@ -11,3 +11,5 @@ Introduction to Federated Core. ![blog image](/images/blog/single-blog-6.jpg) + + diff --git a/content/comparison.md b/content/comparison.md index c65d55a8..22c884bb 100644 --- a/content/comparison.md +++ b/content/comparison.md @@ -3,4 +3,9 @@ title: "Comparison" description: "Comparing Federated Computer with the Other Products" --- -Comparison \ No newline at end of file +There are some *amazing* offerings available for individuals, teams, and small businesses today. The trouble is, kinda like cable and entertainment pricing today, all the subscriptions really start to add up, and they don't really work well together. + +### Federated Core Compared to the Competition + +Here's a handy table to understand how Federated Core stacks up to the competition. The idea is to give you a sense of what other products you'd have to collect together to make up a Federated Core for five users. + diff --git a/content/description.md b/content/description.md index a4c11ca6..997cff68 100644 --- a/content/description.md +++ b/content/description.md @@ -1,6 +1,6 @@ --- -title: "Description" -description: "Everything that goes into Federated Computer." +title: "Federated Core" +description: "Everything that goes into your Federated Core." --- Federated Core is a self-hosted server, you don't share resources with other Customers, with 100% privacy, included backups, updates, and uptime reliability. @@ -19,6 +19,7 @@ For $39/month you get all of the following: * **Vaultwarden** for password management (instead of 1Password or LastPass) * **DNS and DNS Management** for adding non-Federated solutions * **VPN (Wireguard)** for connection to Federated and other websites and team members privately +* **Gitea** and **Caddy** for source code management and static-file website publishing * **Backups** are included ensuring all your data is safe and can be restored in an emergency * **Free Upgrades** and **Improvements** as we roll out new features for your Federated Core, we don't skae the tin cup asking for more * **Unlimited Users** are included...but we figure about eight is the safe limit (for video conferencing at one time) but we can expand this, if you need diff --git a/public/blog/dark-side-of-centralization/index.html b/public/blog/dark-side-of-centralization/index.html index 14a1c83b..b2bd5a2e 100644 --- a/public/blog/dark-side-of-centralization/index.html +++ b/public/blog/dark-side-of-centralization/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/digital-sovereign-toolbox/index.html b/public/blog/digital-sovereign-toolbox/index.html index 52cff7da..f4970975 100644 --- a/public/blog/digital-sovereign-toolbox/index.html +++ b/public/blog/digital-sovereign-toolbox/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/federated-founders-and-our-joyent-history/index.html b/public/blog/federated-founders-and-our-joyent-history/index.html index 174b8e2f..31e80e5c 100644 --- a/public/blog/federated-founders-and-our-joyent-history/index.html +++ b/public/blog/federated-founders-and-our-joyent-history/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/how-we-built-federated-core/index.html b/public/blog/how-we-built-federated-core/index.html index d59d3905..4f6a26ba 100644 --- a/public/blog/how-we-built-federated-core/index.html +++ b/public/blog/how-we-built-federated-core/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/in-praise-of-thunderbird/index.html b/public/blog/in-praise-of-thunderbird/index.html index d7439b7a..c1c83444 100644 --- a/public/blog/in-praise-of-thunderbird/index.html +++ b/public/blog/in-praise-of-thunderbird/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/index.html b/public/blog/index.html index bba6d1f8..679dc2c1 100644 --- a/public/blog/index.html +++ b/public/blog/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/introducing-federated-core/index.html b/public/blog/introducing-federated-core/index.html index 6bab8f8d..7be02dbe 100644 --- a/public/blog/introducing-federated-core/index.html +++ b/public/blog/introducing-federated-core/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/page/2/index.html b/public/blog/page/2/index.html index 99522241..29c9c049 100644 --- a/public/blog/page/2/index.html +++ b/public/blog/page/2/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/power-of-free-and-open-source/index.html b/public/blog/power-of-free-and-open-source/index.html index 240a4416..88a04dfd 100644 --- a/public/blog/power-of-free-and-open-source/index.html +++ b/public/blog/power-of-free-and-open-source/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/stop-being-a-bitch/index.html b/public/blog/stop-being-a-bitch/index.html index 9d2aeda4..790579a2 100644 --- a/public/blog/stop-being-a-bitch/index.html +++ b/public/blog/stop-being-a-bitch/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/the-future-of-cloud-computing/index.html b/public/blog/the-future-of-cloud-computing/index.html index f29fb2d7..a97025e6 100644 --- a/public/blog/the-future-of-cloud-computing/index.html +++ b/public/blog/the-future-of-cloud-computing/index.html @@ -61,11 +61,11 @@ diff --git a/public/blog/we-built-federated-using-federated/index.html b/public/blog/we-built-federated-using-federated/index.html index 1dcc3688..6e97e41e 100644 --- a/public/blog/we-built-federated-using-federated/index.html +++ b/public/blog/we-built-federated-using-federated/index.html @@ -61,11 +61,11 @@ diff --git a/public/careers/index.html b/public/careers/index.html index b800153c..5d511463 100644 --- a/public/careers/index.html +++ b/public/careers/index.html @@ -61,11 +61,11 @@ @@ -136,11 +136,11 @@ -
+
-
+

Federated Computer is working to build the next version of the “cloud” but in a “point-to-point” or “federated” way. We seek to accomplish our goals using a mixture of open-source “Web2” tools, and new tools for money and commerce. We are currently hiring for the following positions:

Systems Engineers

You know everything about everything, everywhere. You understand Linux, LDAP, OAuth, Nostr, DNS, networking in general. You are an everything-digital-mechanic. You have worked in/on open-source technologies for a long time. You know how to make our stuff a lot better.

@@ -155,7 +155,7 @@

++++++++

If any of these positions are of interest, please drop your resume, a form of a cover letter, and anything else you think might be relevant to: careers@federated.computer.

-
+
diff --git a/public/comparison/index.html b/public/comparison/index.html index 2b0768ec..c2c89ef8 100644 --- a/public/comparison/index.html +++ b/public/comparison/index.html @@ -61,11 +61,11 @@ @@ -136,14 +136,16 @@
-
+
-
-

Comparison

+
+

There are some amazing offerings available for individuals, teams, and small businesses today. The trouble is, kinda like cable and entertainment pricing today, all the subscriptions really start to add up, and they don’t really work well together.

+

Federated Core Compared to the Competition

+

Here’s a handy table to understand how Federated Core stacks up to the competition. The idea is to give you a sense of what other products you’d have to collect together to make up a Federated Core for five users.

-
+
diff --git a/public/contact/index.html b/public/contact/index.html index 496fa0be..5d6dc029 100644 --- a/public/contact/index.html +++ b/public/contact/index.html @@ -61,11 +61,11 @@ diff --git a/public/description/index.html b/public/description/index.html index 3ab7b5fd..0c9e33bb 100644 --- a/public/description/index.html +++ b/public/description/index.html @@ -2,7 +2,7 @@ - Description + Federated Core @@ -61,11 +61,11 @@ @@ -127,20 +127,20 @@
-

Description

+

Federated Core

- Everything that goes into Federated Computer. + Everything that goes into your Federated Core.

-
+
-
+

Federated Core is a self-hosted server, you don’t share resources with other Customers, with 100% privacy, included backups, updates, and uptime reliability.

What’s Included

For $39/month you get all of the following:

@@ -155,6 +155,7 @@
  • Vaultwarden for password management (instead of 1Password or LastPass)
  • DNS and DNS Management for adding non-Federated solutions
  • VPN (Wireguard) for connection to Federated and other websites and team members privately
  • +
  • Gitea and Caddy for source code management and static-file website publishing
  • Backups are included ensuring all your data is safe and can be restored in an emergency
  • Free Upgrades and Improvements as we roll out new features for your Federated Core, we don’t skae the tin cup asking for more
  • Unlimited Users are included…but we figure about eight is the safe limit (for video conferencing at one time) but we can expand this, if you need
  • @@ -174,7 +175,7 @@

    The Guarantee

    If you don’t like your Federated Core service, no worries, we will assist you in moving off Federated to your own hosted server for the one-time fee of $199 using the software stack used by Federated or we will cancel your service and return your current month’s money. Terms and conditions apply.

    -
    +
    diff --git a/public/developers/index.html b/public/developers/index.html index 3b345901..81e605e6 100644 --- a/public/developers/index.html +++ b/public/developers/index.html @@ -61,11 +61,11 @@ @@ -136,14 +136,14 @@
    -
    +
    -
    +

    How developers can publish to Federated Computer.

    -
    +
    diff --git a/public/documentation/index.html b/public/documentation/index.html index 650277d3..acc54a46 100644 --- a/public/documentation/index.html +++ b/public/documentation/index.html @@ -61,11 +61,11 @@ @@ -136,17 +136,17 @@
    -
    +
    -
    +

    Federated Computer documentation can be found at this link.

    Federated Computer offers an open-source documentation project where customers and collaborators can work with Federated Computer folks to document how to use the various software components best for work, team collaboration, with desktop and mobile devices, etc.

    This documentation was written for the end-user. We will be publishing a further set of documentation once we open-source our stack and you can install Federated Computer on your own hardward or cloud server.

    image

    -
    +
    diff --git a/public/index.html b/public/index.html index 9e0fd5ec..b91ec159 100644 --- a/public/index.html +++ b/public/index.html @@ -62,11 +62,11 @@ diff --git a/public/index.xml b/public/index.xml index e7919844..07458260 100644 --- a/public/index.xml +++ b/public/index.xml @@ -105,18 +105,8 @@ You know everything about everything, everywhere. You understand Linux, LDAP, OA Mon, 01 Jan 0001 00:00:00 +0000 https://www.federated.computer/comparison/ - Comparison - - - - Description - https://www.federated.computer/description/ - Mon, 01 Jan 0001 00:00:00 +0000 - - https://www.federated.computer/description/ - Federated Core is a self-hosted server, you don’t share resources with other Customers, with 100% privacy, included backups, updates, and uptime reliability. -What’s Included For $39/month you get all of the following: - Single-sign-on User Management to manage users and access in one place Mail with the latest spam and abuse filters built in Nextcloud for groupware, files, calendar, contacts, project management, bookmarks, tasks, photos and much more Jitsi, the open-source video conferencing solution which power Google Meet Element and Matrix, a decentralized replacement for Slack and Microsoft Teams with DMs and channels for your internal and external communications Listmonk for email lists and marketing (replacing Mailchimp and others) Baserow, a robust, open-source replacement for AirTable for making your own applications and database Vaultwarden for password management (instead of 1Password or LastPass) DNS and DNS Management for adding non-Federated solutions VPN (Wireguard) for connection to Federated and other websites and team members privately Backups are included ensuring all your data is safe and can be restored in an emergency Free Upgrades and Improvements as we roll out new features for your Federated Core, we don’t skae the tin cup asking for more Unlimited Users are included…but we figure about eight is the safe limit (for video conferencing at one time) but we can expand this, if you need Human Support means you don’t have to search around or trust in the benevolence of a message board to find the solution to your questions The Experience of Federated ensures smooth sailing since Federated is made from the people who invented cloud computing, node. + There are some amazing offerings available for individuals, teams, and small businesses today. The trouble is, kinda like cable and entertainment pricing today, all the subscriptions really start to add up, and they don’t really work well together. +Federated Core Compared to the Competition Here’s a handy table to understand how Federated Core stacks up to the competition. The idea is to give you a sense of what other products you’d have to collect together to make up a Federated Core for five users. @@ -139,6 +129,17 @@ Federated Computer offers an open-source documentation project where customers a This documentation was written for the end-user. We will be publishing a further set of documentation once we open-source our stack and you can install Federated Computer on your own hardward or cloud server. + + Federated Core + https://www.federated.computer/description/ + Mon, 01 Jan 0001 00:00:00 +0000 + + https://www.federated.computer/description/ + Federated Core is a self-hosted server, you don’t share resources with other Customers, with 100% privacy, included backups, updates, and uptime reliability. +What’s Included For $39/month you get all of the following: + Single-sign-on User Management to manage users and access in one place Mail with the latest spam and abuse filters built in Nextcloud for groupware, files, calendar, contacts, project management, bookmarks, tasks, photos and much more Jitsi, the open-source video conferencing solution which power Google Meet Element and Matrix, a decentralized replacement for Slack and Microsoft Teams with DMs and channels for your internal and external communications Listmonk for email lists and marketing (replacing Mailchimp and others) Baserow, a robust, open-source replacement for AirTable for making your own applications and database Vaultwarden for password management (instead of 1Password or LastPass) DNS and DNS Management for adding non-Federated solutions VPN (Wireguard) for connection to Federated and other websites and team members privately Gitea and Caddy for source code management and static-file website publishing Backups are included ensuring all your data is safe and can be restored in an emergency Free Upgrades and Improvements as we roll out new features for your Federated Core, we don’t skae the tin cup asking for more Unlimited Users are included…but we figure about eight is the safe limit (for video conferencing at one time) but we can expand this, if you need Human Support means you don’t have to search around or trust in the benevolence of a message board to find the solution to your questions The Experience of Federated ensures smooth sailing since Federated is made from the people who invented cloud computing, node. + + Merchandise https://www.federated.computer/merchandise/ diff --git a/public/merchandise/index.html b/public/merchandise/index.html index 5ea1773f..0bd82177 100644 --- a/public/merchandise/index.html +++ b/public/merchandise/index.html @@ -61,11 +61,11 @@ @@ -136,14 +136,14 @@
    -
    +
    -
    +

    lots of nice items to come.

    -
    +
    diff --git a/public/partners/index.html b/public/partners/index.html index a774da56..0a3b8112 100644 --- a/public/partners/index.html +++ b/public/partners/index.html @@ -61,11 +61,11 @@ @@ -136,14 +136,14 @@
    -
    +
    -
    +

    How to sell and promote Federated Computer.

    -
    +
    diff --git a/public/privacy/index.html b/public/privacy/index.html index cc6177fb..9e9261a1 100644 --- a/public/privacy/index.html +++ b/public/privacy/index.html @@ -61,11 +61,11 @@ @@ -137,11 +137,11 @@
    -
    +
    -
    +

    It is Federated Computer’s policy to respect your privacy regarding any information we may collect while operating our website. This Privacy Policy applies to any Federated Computer website (hereinafter, “us”, “we”, or “federated.computer”). We respect your privacy and are committed to protecting personally identifiable information you may provide us through the Website. We have adopted this privacy policy (“Privacy Policy”) to explain what information may be collected on our Website, how we use this information, and under what circumstances we may disclose the information to third parties. This Privacy Policy applies only to information we collect through the Website and does not apply to our collection of information from other sources.

    This Privacy Policy, together with the Terms and conditions posted on our Website, set forth the general rules and policies governing your use of our Website. Depending on your activities when visiting our Website, you may be required to agree to additional terms and conditions.

    Website Visitors

    @@ -166,7 +166,7 @@

    Those who engage in transactions with Federated Computer – by purchasing Federated Computer’s services or products, are asked to provide additional information, including as necessary the personal and financial information required to process those transactions. In each case, Federated Computer collects such information only insofar as is necessary or appropriate to fulfill the purpose of the visitor’s interaction with Federated Computer. Federated Computer does not disclose personally-identifying information other than as described below. And visitors can always refuse to supply personally-identifying information, with the caveat that it may prevent them from engaging in certain website-related activities.

    Although most changes are likely to be minor, Federated Computer may change its Privacy Policy from time to time, and in Federated Computer’s sole discretion. Federated Computer encourages visitors to frequently check this page for any changes to its Privacy Policy. Your continued use of this site after any change in this Privacy Policy will constitute your acceptance of such change.

    -
    +
    diff --git a/public/projectswelove/index.html b/public/projectswelove/index.html index 07152f95..4bfc1d5a 100644 --- a/public/projectswelove/index.html +++ b/public/projectswelove/index.html @@ -61,11 +61,11 @@ @@ -136,11 +136,11 @@
    -
    +
    -
    +

    We think the following projects deservce your attention. They are working to bring sovereignty to individuals and teams worldwide.

    Self Hosting

    These folks are building tools for digital sovereignty alongside our efforts here at Federated:

    @@ -161,7 +161,7 @@

    Meshtastic

    We love being able to do networking without anyone at all watching. We can talk privacy and sovereignty all we want, but we still have to get in the road of the ISP (who’s watching us). We’ve got some plans for this project, too. Meanwhile, tinker away!

    -
    +
    diff --git a/public/purchase/index.html b/public/purchase/index.html index dd2298ac..03246c08 100644 --- a/public/purchase/index.html +++ b/public/purchase/index.html @@ -61,11 +61,11 @@ @@ -136,14 +136,14 @@
    -
    +
    -
    +

    We aren’t open for business, yet.

    -
    +
    diff --git a/public/sitemap.xml b/public/sitemap.xml index 6bfea376..5b52ad14 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -40,12 +40,12 @@ https://www.federated.computer/categories/ https://www.federated.computer/comparison/ - - https://www.federated.computer/description/ https://www.federated.computer/developers/ https://www.federated.computer/documentation/ + + https://www.federated.computer/description/ https://www.federated.computer/contact/ diff --git a/public/sovereignreset/index.html b/public/sovereignreset/index.html index e7a63827..96237651 100644 --- a/public/sovereignreset/index.html +++ b/public/sovereignreset/index.html @@ -61,11 +61,11 @@ @@ -136,11 +136,11 @@
    -
    +
    -
    +

    We started Sovereign Reset to provide a place to talk about living a sovereign lifestyle in full beyond just digital sovereignty.

    Sovereign Reset is a partnership between Federated Computer and a number of individuals and companies in the areas of:

      @@ -153,7 +153,7 @@

    There is a weekly Sovereign Reset Podcast where we talk with interesting individuals working around the globe to bring the sovereign lifestyle to others.

    -
    +
    diff --git a/public/support/index.html b/public/support/index.html index 45ac14a3..1a8a5c8d 100644 --- a/public/support/index.html +++ b/public/support/index.html @@ -61,11 +61,11 @@ @@ -136,14 +136,14 @@
    -
    +
    -
    +

    We aren’t open for business, yet.

    -
    +
    diff --git a/public/team/index.html b/public/team/index.html index 63627acf..d711ac5e 100644 --- a/public/team/index.html +++ b/public/team/index.html @@ -61,11 +61,11 @@ @@ -136,11 +136,11 @@
    -
    +
    -
    +

    David Young: wow! Photoshop can make anyone appear thin and pant-suited.

    Barry Goers: professional hockey player, still a player. Will biz dev you until you giggle.

    Blake Burris we financed this ***ing company using that gold chain as collateral!

    @@ -148,7 +148,7 @@

    image

    (c) whoever, whenever, whatever.

    -
    +
    diff --git a/themes/apsho/layouts/_default/old_single.html b/themes/apsho/layouts/_default/old_single.html new file mode 100644 index 00000000..5288566c --- /dev/null +++ b/themes/apsho/layouts/_default/old_single.html @@ -0,0 +1,28 @@ +{{ define "main" }} + + + +
    +
    +
    +
    +
    + {{ .Content }} +
    +
    +
    +
    +
    + +{{ end }} \ No newline at end of file diff --git a/themes/apsho/layouts/_default/single.html b/themes/apsho/layouts/_default/single.html index 5288566c..a97ff379 100644 --- a/themes/apsho/layouts/_default/single.html +++ b/themes/apsho/layouts/_default/single.html @@ -13,13 +13,13 @@
    -
    +
    -
    +
    {{ .Content }} -
    +