diff --git a/README.md b/README.md index adcbb6e..6e3e6b6 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,7 @@ Docker commands to create the local containers. -`docker build -t pa4kev/portfolio-reactjs-full:latest -f Dockerfile .` - -`docker push pa4kev/portfolio-reactjs-full:latest` +`docker build -t pa4kev/portfolio-reactjs-full:latest -f Dockerfile . && docker push pa4kev/portfolio-reactjs-full:latest` ## Server (Enaga) @@ -112,13 +110,13 @@ if required, run certbot to set the certificates. * First stop Nginx, as it is using port 80 -``sudo systemctl stop nginx.service`` +`sudo systemctl stop nginx.service` * Run this container, I doubt that i am understanding how it works properly though. -`docker run -it --rm -p 80:80 --name certbot -v "/etc/letsencrypt:/etc/letsencrypt" -v "/var/lib/letsencrypt:/var/lib/letsencrypt" certbot/certbot certonly --standalone --break-my-certs -d matsubara.nl -d www.matsubara.nl -d pa4kev.nl -d www.pa4kev.nl -d michelaben.nl -d www.michelaben.nl -d gitea.matsubara.nl` +`docker run -it --rm -p 80:80 --name certbot -v "/etc/letsencrypt:/etc/letsencrypt" -v "/var/lib/letsencrypt:/var/lib/letsencrypt" certbot/certbot certonly --standalone --break-my-certs -d matsubara.nl -d www.matsubara.nl -d pa4kev.nl -d www.pa4kev.nl -d michelaben.nl -d www.michelaben.nl -d gitea.matsubara.nl -d hakyll.matsubara.nl` -`docker run -it --rm --name certbot --net webproxy -v $(pwd)/letsencrypt:/etc/letsencrypt -v $(pwd)/letsencrypt-lib:/var/lib/letsencrypt certbot/certbot certonly --standalone --preferred-challenges http -d matsubara.nl -d www.matsubara.nl -d pa4kev.nl -d www.pa4kev.nl -d michelaben.nl -d www.michelaben.nl -d gitea.matsubara.nl` +`docker run -it --rm --name certbot --net webproxy -v $(pwd)/letsencrypt:/etc/letsencrypt -v $(pwd)/letsencrypt-lib:/var/lib/letsencrypt certbot/certbot certonly --standalone --preferred-challenges http -d matsubara.nl -d www.matsubara.nl -d pa4kev.nl -d www.pa4kev.nl -d michelaben.nl -d www.michelaben.nl -d gitea.matsubara.nl -d hakyll.matsubara.nl` * Start Nginx again. @@ -131,6 +129,30 @@ if required, run certbot to set the certificates. * `-t` foreground mode * `-d` detached mode +### Hakyll site + +#### Local: + +`docker build -t pa4kev/portfolio-hakyll:latest -f Dockerfile . && docker push pa4kev/portfolio-hakyll:latest` + +#### Server: + +`docker pull pa4kev/portfolio-hakyll` + +`docker run -t -d --name hakyll -p 8081:80 pa4kev/portfolio-hakyll` + +### Icon + +* [How to convert a square SVG to all-size ICO?](https://graphicdesign.stackexchange.com/questions/77359/how-to-convert-a-square-svg-to-all-size-ico) + +`inkscape -w 16 -h 16 -o 16.png master.svg` +`inkscape -w 32 -h 32 -o 32.png master.svg` +`inkscape -w 48 -h 48 -o 48.png master.svg` + +`sudo apt-get install imagemagick` + +`convert 16.png 32.png 48.png icon.ico` + ## Nginx `sudo vim /etc/nginx/sites-available/matsubara.nl` @@ -218,6 +240,25 @@ You can now run for development: `elm make src/Main.elm --output=index.js` +## Haskell + +`cabal init --interactive` + +`cabal update` + +`cabal new-install hakyll` + +Add hakyll to `.cabal` file, then build it: `cabal build`. + +`~/.local/bin/hakyll-init portfolio` + +Inside the `portfolio` directory: + +* `cabal new-install` + +* `cabal new-run site `, `build` or `watch` + + ## Documentation [Create React App](https://github.com/facebook/create-react-app)