So I made a booboo and already pushed a merge commit. The merged branch had a few commits that where not ready for develop. After reverting the merge one commit needed to be reapplied. But a merge wont work, because it already is merged (and reverted). What you can do is a cherry pick.
How I created the problem
git merge branch
git push origin develop
Here there was no way back, accept rebasing but that’s still out of my comfort zone (update dec-2019: still is).
How I solved it.
git revert eaf8c471 -m2
git cherry-pick fa9a6b0
Cherry pick just straight up applies the changes made in the files. Where a merge applies the git changes.
Keep in mind this will only help if you need a handful of commits reapplied. Otherwise you will need to find an other way. Or cherry pick a lot…
And reload nginx sudo nginx -t && sudo service nginx reload
Getting the ssl certificate
So now we can generate and validate the ssl certificates. With the command below. The email-address is used only for checks and warnings so I recommend an email which you do check. And of course change the domain. We will get a certificate for both www and non-www domain.
This part is a bit tricky. Because it’s depending on third parties. And they all work a bit different. The big stokes are the same for everyone but the how will differ a bit. This step can also be done later.
Opening the router to the outside world.
You need to login into your modem which your ISP provided to you. How to do that might differ per modem. But usually it will be an ip which start with 192.168.x.x To help you get started. A few pointers.
Inspect the modem. Look for passwords and model type.
Google the modem type, this will help with the ip and maybe the default login credentials.
Some still have default passwords, instead of random generated.
Call your ISP, it’s there modem they should be able to help.
Once you are in the modem settings we are going to do a thing called port-forwarding. I had a lot of problems figuring this out. Because of that I’m going to refer you else where. Keep in mind the following.
You will need to forward it to the hostname or the internal IP used by the Pi. If you need the IP see below to give a static IP. The hostname you can get with hostname.
The ports we are talking about should be 80 for http and 443 for https.
I needed to fiddle with a setting “DMZ Host”network
If you are struggling google port-forwarding with your modem
As I said this is really not my piece of pi, so here is a better guide: HowToGeek guide
Adding a domain name
First you will need to register a domain name. There are a lot of these registrars as they are called. I’m not going to recommend any because I registered all my domains at a Dutch company. One registered you will need to add a DNS A-record that will point to your home IP.
You can get your home network IP with the following command:
I’ve had the idea for a blog for years. But actually bloging keeping it up is hard. So here is another go. This blog had no restrictions for me. So when setting this up I did some things I would(/could) never do anywhere else. The biggest sin I commit is not having a development environment. So how I this blog (being?) build: