Friday, April 24, 2015

Not committing merge; use 'git commit' to complete the merge.

So, say you are leaving your current development branch in git to a standard base branch of your repository-- you checkout the branch in your local environment then you pull from the remote and lo and behold there is a merge conflict.

Not committing merge; use 'git commit' to complete the merge.

What I usually want to do is to:
git checkout remote/branch local/path/to/file

Here's to no more 'github shenanigans commit messages...'

Wednesday, April 22, 2015

How to make a SHA-2 2048 bit CSR for a SSL Certificate with OpenSSL

Long time, no write...

SHA-2 2048 OpenSSL command to generate a Certificate Signing Request(CSR) and Private Key (PK) -- which you need to get a SSL Certificate.

{REPLACE THESE VALUES}

openssl req -new -newkey rsa:2048 -sha256 -nodes -out {DOMAIN.TLD}.rsa.csr -keyout {DOMAIN.TLD}.rsa.pkey -subj "/C={US}/ST={STATE||PROVENCE}/L={CITY}/O={COMPANY-NAME}/CN={DOMAIN.TLD}


The code you run will likely not have any curly braces, {}. For instance, for my fictional company Example Inc. would make a certificate signing request as such:

openssl req -new -newkey rsa:2048 -sha256 -nodes -out example.com.rsa.csr -keyout example.com.rsa.pkey -subj "/C=US/ST=OHIO/L=EASTLAKE/O=EXAMPLE/OU=IT/CN=EXAMPLE.COM"

The Country is US, the STate is OHIO, and the City (L) is Eastlake.
The Organization is Example, the Organizational Unit is IT, and the Common Name is EXAMPLE.COM. If you were wondering what the pieces parts in the subject argument meant.

Followers