diff --git a/content/about.md b/content/about.md index deff8c0..8eacb6d 100644 --- a/content/about.md +++ b/content/about.md @@ -9,9 +9,7 @@ I'm interested in Linux, Networks, Securety and P2P Solutions. This page exists for my projects, to inform friends about things and so on. -If you have any questions, don't be afraid to write me an [email]({{< siteurl >}}contact). - -You can download the PGP Key [here]({{< siteurl >}}publickey.gpg). +If you have any questions, don't be afraid to write me an [[Contact Info]({{< siteurl >}}contact)]. > *This page exists on the normal [Web](https://mh.obermui.de/), on [IPFS](https://ipfs.io/ipns/QmaepDhCbYaQZ58hEAejPy6BfDg14QurRiU2mTWBzmtJsf/) and on [ZeroNet](http://127.0.0.1:43110/15VuKHSRKpgyGAX87mCHYF2L95vad33SPY/)* diff --git a/content/contact.md b/content/contact.md index 4d10801..1643a62 100644 --- a/content/contact.md +++ b/content/contact.md @@ -6,6 +6,8 @@ draft = false **Martin H** -Mail: "MH-Site[a-t]obermui.de" +Mail: "6543[a-t]obermui.de" [PGP Key]({{< siteurl >}}publickey.gpg) Tox ID: BBA4BC0FF865B31F48C7B4E746961E027F643F826798EE9C2FB9533A9DE1024CAEFA14EA78B9 + +Diaspora: [6543@ggg.social](diaspora://6543@ggg.social) diff --git a/content/impressum.md b/content/impressum.md index 0a220f2..3c70ef4 100644 --- a/content/impressum.md +++ b/content/impressum.md @@ -6,4 +6,4 @@ draft = false This is a imprint -look at this: About -> email +look at this: About -> [Contact Info] diff --git a/content/services.md b/content/services.md index b330571..be826c4 100644 --- a/content/services.md +++ b/content/services.md @@ -10,17 +10,17 @@ draft = false +++ - Software | Address | Status | Comments - -----------------------------------------------|----------------------------|:-------:|:-------- - [Diaspora](https://diasporafoundation.org/) | Diaspora.AltinSystems.DE | OFF | switch domain - [NextCloud](https://nextcloud.com) | [Cloud.Obermui.de](https://cloud.obermui.de/login) | On | - [PeerTube](https://joinpeertube.org) | [Video.Obermui.de](https://Video.Obermui.de) | On | - [TeamSpeak](https://www.teamspeak.com/)| [Obermui.de](ts3server://80.241.216.82?port=9987) | On | - [MineCraft](https://minecraft.net/) | [Obermui.DE](minecraft://Obermui.DE:25565) | Off | migrate server - [CJDNS](https://github.com/cjdelisle/cjdns/) | [Obermui.de:51935]({{}}post/connect-2-cjdns/) | ON | - [OpenTracker](https://erdgeist.org/arts/software/opentracker/)| [CJDNS Address](fc15:368e:2797:79d1:71d4:f698:c081:d4a2) | Off | migrate server - [Gitea](https://gitea.io) | [Code.Obermui.DE](https://Code.Obermui.DE/explore/repos) | On | - [IPFS](https://ipfs.io/) | Internal | On | + Software | Address | Status | Comments + ---------------------------------------------|------------------------------------------------------|:------------------------:|:-------------- + [Diaspora](https://diasporafoundation.org/) | Diaspora.AltinSystems.DE | {{}} | switch domain + [NextCloud](https://nextcloud.com) | [Cloud.Obermui.de](https://cloud.obermui.de/login) | {{}} | + [PeerTube](https://joinpeertube.org) | [Video.Obermui.de](https://Video.Obermui.de) | {{}} | + [TeamSpeak](https://www.teamspeak.com/) | [Obermui.de](ts3server://80.241.216.82?port=9987) | {{}} | + [MineCraft](https://minecraft.net/) | [Obermui.DE](minecraft://Obermui.DE:25565) | {{}} | migrate server + [CJDNS](https://github.com/cjdelisle/cjdns/) | [Obermui.de:51935]({{}}post/connect-2-cjdns/) | {{}} + [OpenTracker](https://erdgeist.org/arts/software/opentracker/)| [CJDNS Address](fc15:368e:2797:79d1:71d4:f698:c081:d4a2) | {{}} | migrate server + [Gitea](https://gitea.io) | [Code.Obermui.DE](https://Code.Obermui.DE/explore) | {{}} | + [IPFS](https://ipfs.io/) | Internal | {{}} | diff --git a/layouts/shortcodes/on-off.html b/layouts/shortcodes/on-off.html new file mode 100644 index 0000000..a42a820 --- /dev/null +++ b/layouts/shortcodes/on-off.html @@ -0,0 +1,35 @@ +{{ $mode := .Get 0 }}{{ $opt1 := .Get 1 }}{{ $opt2 := .Get 2 }} + +{{ $img_on := ( printf "%s%s" $.Page.Site.BaseURL "img/on-off/switch-on-icon_smal.png" )}} +{{ $img_off := ( printf "%s%s" $.Page.Site.BaseURL "img/on-off/switch-off-icon_smal.png" )}} + +{{ if eq $mode "on" }} + On +{{ else if eq $mode "off"}} + Off +{{ else if eq $mode "imgping" }} + {{ with $opt1 }} + {{ $id := md5 $opt1 }} + {{ if eq $opt2 "on" }} + On + {{ else }} + Off + {{ end }} + + {{ else }} + imgping [URL to image] [default on/off] + {{ end }} +{{ else }} + ??? +{{ end }} diff --git a/layouts/shortcodes/reload.html b/layouts/shortcodes/reload.html new file mode 100644 index 0000000..483de3b --- /dev/null +++ b/layouts/shortcodes/reload.html @@ -0,0 +1,13 @@ +{{ $seconds := .Get 0 }} +{{ $ms := ( printf "%s%s" $seconds "000" )}} + diff --git a/static/img/on-off/readme.txt b/static/img/on-off/readme.txt new file mode 100644 index 0000000..ecc6c03 --- /dev/null +++ b/static/img/on-off/readme.txt @@ -0,0 +1,128 @@ +small-n-flat +============ + +svg icons on a 24px grid +http://paomedia.github.io/small-n-flat/ + +![small-n-flat normal size](preview-24.png) + + +License: +============ + +CC0 1.0 Universal + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator and +subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the +purpose of contributing to a commons of creative, cultural and scientific +works ("Commons") that the public can reliably and without fear of later +claims of infringement build upon, modify, incorporate in other works, reuse +and redistribute as freely as possible in any form whatsoever and for any +purposes, including without limitation commercial purposes. These owners may +contribute to the Commons to promote the ideal of a free culture and the +further production of creative, cultural and scientific works, or to gain +reputation or greater distribution for their Work in part through the use and +efforts of others. + +For these and/or other purposes and motivations, and without any expectation +of additional consideration or compensation, the person associating CC0 with a +Work (the "Affirmer"), to the extent that he or she is an owner of Copyright +and Related Rights in the Work, voluntarily elects to apply CC0 to the Work +and publicly distribute the Work under its terms, with knowledge of his or her +Copyright and Related Rights in the Work and the meaning and intended legal +effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not limited +to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, + and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + + iii. publicity and privacy rights pertaining to a person's image or likeness + depicted in a Work; + + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + + v. rights protecting the extraction, dissemination, use and reuse of data in + a Work; + + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation thereof, + including any amended or successor version of such directive); and + + vii. other similar, equivalent or corresponding rights throughout the world + based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of Affirmer's Copyright +and Related Rights and associated claims and causes of action, whether now +known or unknown (including existing as well as future claims and causes of +action), in the Work (i) in all territories worldwide, (ii) for the maximum +duration provided by applicable law or treaty (including future time +extensions), (iii) in any current or future medium and for any number of +copies, and (iv) for any purpose whatsoever, including without limitation +commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes +the Waiver for the benefit of each member of the public at large and to the +detriment of Affirmer's heirs and successors, fully intending that such Waiver +shall not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of the Work +by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be +judged legally invalid or ineffective under applicable law, then the Waiver +shall be preserved to the maximum extent permitted taking into account +Affirmer's express Statement of Purpose. In addition, to the extent the Waiver +is so judged Affirmer hereby grants to each affected person a royalty-free, +non transferable, non sublicensable, non exclusive, irrevocable and +unconditional license to exercise Affirmer's Copyright and Related Rights in +the Work (i) in all territories worldwide, (ii) for the maximum duration +provided by applicable law or treaty (including future time extensions), (iii) +in any current or future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, advertising or +promotional purposes (the "License"). The License shall be deemed effective as +of the date CC0 was applied by Affirmer to the Work. Should any part of the +License for any reason be judged legally invalid or ineffective under +applicable law, such partial invalidity or ineffectiveness shall not +invalidate the remainder of the License, and in such case Affirmer hereby +affirms that he or she will not (i) exercise any of his or her remaining +Copyright and Related Rights in the Work or (ii) assert any associated claims +and causes of action with respect to the Work, in either case contrary to +Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties + of any kind concerning the Work, express, implied, statutory or otherwise, + including without limitation warranties of title, merchantability, fitness + for a particular purpose, non infringement, or the absence of latent or + other defects, accuracy, or the present or absence of errors, whether or not + discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without limitation + any person's Copyright and Related Rights in the Work. Further, Affirmer + disclaims responsibility for obtaining any necessary consents, permissions + or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to this + CC0 or use of the Work. + +For more information, please see + diff --git a/static/img/on-off/switch-off-icon.png b/static/img/on-off/switch-off-icon.png new file mode 100644 index 0000000..8c3ce98 Binary files /dev/null and b/static/img/on-off/switch-off-icon.png differ diff --git a/static/img/on-off/switch-off-icon_smal.png b/static/img/on-off/switch-off-icon_smal.png new file mode 100644 index 0000000..9e7e397 Binary files /dev/null and b/static/img/on-off/switch-off-icon_smal.png differ diff --git a/static/img/on-off/switch-on-icon.png b/static/img/on-off/switch-on-icon.png new file mode 100644 index 0000000..974495b Binary files /dev/null and b/static/img/on-off/switch-on-icon.png differ diff --git a/static/img/on-off/switch-on-icon_smal.png b/static/img/on-off/switch-on-icon_smal.png new file mode 100644 index 0000000..25a4c69 Binary files /dev/null and b/static/img/on-off/switch-on-icon_smal.png differ