.drone.yml

@@ -33,9 +33,6 @@ steps:
 #   when:
 #     status:
 #     - success
-<<<<<<< HEAD
-
-=======
 
 - name: running
   image: jekyll/jekyll:latest
@@ -74,7 +71,6 @@ steps:
 
 
 
->>>>>>> f7090510b1b31c9fbe921ebd9372fa91944c8531
 # - name: discord
 #   pull: always
 #   image: appleboy/drone-discord

_posts/2021-09-03-portainer-oauth.md

@@ -1,26 +0,0 @@
----
-layout: post
-title: "Portainer Oauth"
-description: "Login into Portainer using your Github account or even better.. your private Gitea account (with 2FA)"
-author: sthope
-image: 
-categories: [ Docker, Portainer, Portainer Agent ]
-comments: true
-pic01: "/assets/images/portainer_oauth/1.jpg"
-pic02: "/assets/images/portainer_oauth/2.jpg"
-pic03: "/assets/images/portainer_oauth/3.jpg"
-pic04: "/assets/images/portainer_oauth/4.jpg"
-pic05: "/assets/images/portainer_oauth/5.jpg"
-pic06: "/assets/images/portainer_oauth/6.jpg"
-pic07: "/assets/images/portainer_oauth/7.jpg"
----
-
-
-# Github
-
-Login into Github and go to https://github.com/settings/profile on the right side menu near the end enter `Developer settings` and select `OAuth Apps`  
-![pic01]({{page.pic01}})
-
-# Gitea
-
-Enter https://git.sthope.dev/user/settings and go to `Applications`

_posts/2021-09-03-ssh-keys.md

@@ -15,7 +15,7 @@ cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 64 | head -n 1
 Replace `very_long_secret` with the long generated password and replace `/opt/.certs/service` with the location for your keys and the name (different name for each key "service")
 Default generally is `~/.ssh/id_rsa`, you can omit `-f "/opt/.certs/service"` if you don't want to choose it.
 ```
-ssh-keygen -t rsa -b 4096 -f "/opt/.certs/service" -C "Private Key Comment"
+ssh-keygen -t rsa -b 4096 -f "/opt/.certs/service" -C "Hopeless Automations"
 ```
 
 Key should be created along also with .pub key