refactoring

.gitignore

@@ -1 +1,3 @@
-/helpers/crypt
+/etc/config
+/share/bin/crypt
+/share/bin/twigc

Makefile

@@ -1,4 +1,8 @@
+all: install
 
+install: build-crypt
+	wget -q -O ./share/bin/twigc https://github.com/okdana/twigc/releases/download/v0.3.1/twigc.phar
+	chmod +x ./share/bin/twigc
 
 build-crypt:
-	gcc -lcrypt ./src/crypt/crypt.c -o ./helpers/crypt
+	gcc -lcrypt ./src/crypt/crypt.c -o ./share/bin/crypt

bin/vhost-add

@@ -2,7 +2,7 @@
 
 export SCRIPT_NAME="$(realpath "$0")"
 export SCRIPT_PATH="$(dirname "$SCRIPT_NAME")"
-export PATH="$SCRIPT_PATH/../helpers/:$PATH"
+export PATH="$SCRIPT_PATH/../share/bin/:$PATH"
 
 cd "$SCRIPT_PATH/../"
 

src/templates/vhost-http.twig

@@ -10,7 +10,8 @@
 	ErrorLog /services/web/logs/{{ DOMAIN }}.log
 	CustomLog /services/web/logs/{{ DOMAIN }}.log combined
 {% block force_https %}{% if WEB_HTTPS_FORCE == "yes" %}
-	Redirect permanent / https://{{ DOMAIN }}/{% endif %}{% endblock %}
+	Redirect permanent / https://{{ DOMAIN }}/
+{% endif %}{% endblock %}
 
 	<Directory {{ DOCUMENT_ROOT }}>
 	    Options -Indexes +FollowSymLinks +MultiViews