From 12d6e3824cb5de07f59c2219ba5aa2867dbbf2e6 Mon Sep 17 00:00:00 2001
From: Felipe Martin <me@fmartingr.com>
Date: Mon, 7 Oct 2019 18:15:44 +0200
Subject: [PATCH] Cleanup

---
 .envrc                |  4 +++-
 .gitignore            |  2 +-
 .vscode/settings.json |  4 ++--
 Makefile              |  2 ++
 README.md             |  4 ++++
 server/emacs.sh       | 20 --------------------
 server/nginx.conf     | 21 ---------------------
 server/nginx.service  | 15 ---------------
 server/nginx.sh       | 33 ---------------------------------
 9 files changed, 12 insertions(+), 93 deletions(-)
 delete mode 100644 server/emacs.sh
 delete mode 100644 server/nginx.conf
 delete mode 100644 server/nginx.service
 delete mode 100644 server/nginx.sh

diff --git a/.envrc b/.envrc
index e2ee336..65fceab 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,3 @@
-source .virtualenv/bin/activate
+#!/bin/bash
+
+source .venv/bin/activate
diff --git a/.gitignore b/.gitignore
index eeef513..1d02cf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # python
 __pycache__
-.virtualenv
+.venv
 
 # node/bower
 node_modules
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7c81ff7..bed7629 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "python.pythonPath": ".virtualenv/bin/python3"
-}
\ No newline at end of file
+    "python.pythonPath": ".venv/bin/python3"
+}
diff --git a/Makefile b/Makefile
index cc9a6e9..a1275e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 setup:
+	python3 -m venv .venv
+	source .venv/bin/activate && pip install -r requirements.txt
 	npm install
 
 dev:
diff --git a/README.md b/README.md
index e69de29..6a27415 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,4 @@
+fmartingr.com
+=============
+
+Source code for my personal site hosted at [fmartingr.com](https://fmartingr.com)
diff --git a/server/emacs.sh b/server/emacs.sh
deleted file mode 100644
index fcf2a79..0000000
--- a/server/emacs.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Emacs install script used into scaleway.c1 servers due to ARM arch
-
-EMACS_VERSION="25.1"
-
-
-# Asume root
-cd
-
-# Install dependencies
-yum install -y ncurses.devel
-
-# Download package
-curl -O http://ftp.rediris.es/mirror/GNU/gnu/emacs/emacs-$EMACS_VERSION.tar.xz
-
-# Configure, Make, and Install
-./configure
-make
-make install
diff --git a/server/nginx.conf b/server/nginx.conf
deleted file mode 100644
index 4071786..0000000
--- a/server/nginx.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-server {
-  listen *:80;
-  server_name www.fmartingr.com;
-  return 301 http://fmartingr.com$request_uri;
-}
-
-server {
-  listen *:80;
-  server_name fmartingr.com;
-  server_tokens off;
-
-  client_max_body_size 1M;
-
-  access_log /var/log/fmartingr.com/nginx-access.log;
-  error_log /var/log/fmartingr.com/nginx-error.log;
-
-  location / {
-    alias   /var/www/fmartingr.com/html/;
-    autoindex off;
-  }
-}
diff --git a/server/nginx.service b/server/nginx.service
deleted file mode 100644
index 71e55ae..0000000
--- a/server/nginx.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=The NGINX HTTP and reverse proxy server
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t
-ExecStart=/usr/sbin/nginx
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s QUIT $MAINPID
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/server/nginx.sh b/server/nginx.sh
deleted file mode 100644
index 54d59f3..0000000
--- a/server/nginx.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Nginx install script used into scaleway.c1 servers dure to ARM architecture
-
-NGINX_VERSION="1.11.7"
-
-# As root
-cd
-
-# Install nginx requirements
-yum install -y pcre-devel zlib-devel
-
-# Download nginx package
-curl -O http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz
-tar xf nginx-$NGINX_VERSION.tar.gz
-cd nginx-$NGINX_VERSION
-
-# Configure, make and Install
-./configure
-make
-make install
-
-# Symlink binary
-ln -s /usr/local/nginx/sbin/nginx /usr/sbin/nginx
-
-# Now create the service file as in the template in
-# /etc/systemd/system/nginx.service
-
-# Uncomment the pid directive from the nginx conf and change its value to
-# /run/nginx.pid
-
-# add rule to iptables
-# -A IN_public_allow -p tcp -m tcp --dport 80 -m conntrack --ctstate NEW -j ACCEPT