diff --git a/.gitignore b/.gitignore
index 3d7119e..ca785c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,23 @@
-# Boz-PHP configuration file
+# configuration file
/load.php
# GNU Gettext compiled .po files
*.mo
# Some proprietary IDE
.idea/
# Generated by tagliatella.php each time it's run
schedule.xml
-# API configuration file
-/includes/api/config.php
-
-# htaccess.txt is just an example (that doesn't work even though it's formally correct in every way possible)
+# The local .htaccess file (the versioned one is in /documentation/apache/htaccess.conf)
/.htaccess
# https://www.vagrantup.com/
/.vagrant
-# Adminer
-adminer.php
+# Adminer (fuck you @lvps)
+/adminer.php
-# The framework
-includes/suckless-php
+# our unuseful framework
+/includes/suckless-php
diff --git a/Vagrant/apache.conf b/Vagrant/apache.conf
index 34c458f..bfebe04 100644
--- a/Vagrant/apache.conf
+++ b/Vagrant/apache.conf
@@ -1,18 +1,20 @@
ServerName ldto
ServerAlias localhost 127.0.0.1
DocumentRoot /vagrant
DirectoryIndex index.php index.html
LogLevel info
php_admin_flag display_errors 1
php_admin_flag display_startup_errors 1
php_admin_flag html_errors 1
php_admin_value error_reporting -1
- Require all granted
- Options Indexes FollowSymLinks
- Include /vagrant/documentation/apache/htaccess.conf
+ # allow a non-standard webserver pathname
+ Require all granted
+
+ # allow to load the .htaccess file
+ AllowOverride yes
diff --git a/Vagrant/bootstrap.sh b/Vagrant/bootstrap.sh
index 0b9e1b0..60e800f 100755
--- a/Vagrant/bootstrap.sh
+++ b/Vagrant/bootstrap.sh
@@ -1,152 +1,153 @@
#!/bin/sh
# Vagrant provision: bootstrap
# Exit immediately if a command exits with a non-zero status
set -e
PORT_APACHE=8070
PORT_NGINX=8071
DOMAIN=localhost
WELCOME_APACHE=http://"$DOMAIN":"$PORT_APACHE"
WELCOME_NGINX=http://"$DOMAIN":"$PORT_NGINX"
PROJECT=/vagrant
WWW="$PROJECT"
DB_NAME=ldto
DB_PREFIX=ldto_
SUCKLESS_PHP="$PROJECT"/includes/suckless-php
SUCKLESS_PHP_REPO=https://github.com/valerio-bozzolan/suckless-php.git
# Very scaring
DB_USER=ldto
DB_PASS=ldto
# prevent interaction during phpmyadmin installation
echo "phpmyadmin phpmyadmin/dbconfig-install boolean true" | debconf-set-selections
echo "phpmyadmin phpmyadmin/app-password-confirm password $DB_PASS" | debconf-set-selections
echo "phpmyadmin phpmyadmin/mysql/admin-pass password $DB_PASS" | debconf-set-selections
echo "phpmyadmin phpmyadmin/mysql/app-pass password $DB_PASS" | debconf-set-selections
echo "phpmyadmin phpmyadmin/reconfigure-webserver multiselect apache2" | debconf-set-selections
# avoid warnings in apt
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install --yes mariadb-server \
php \
php-mysql \
php-mbstring \
php-xml \
apache2 \
libapache2-mod-php \
gettext \
libmarkdown-php \
libjs-jquery \
libjs-leaflet \
git \
phpmyadmin
echo "stop apache"
systemctl stop apache2
if [ ! -e "$SUCKLESS_PHP" ]; then
git clone "$SUCKLESS_PHP_REPO" "$SUCKLESS_PHP"
else
git -C "$SUCKLESS_PHP" pull
fi
echo "create a file with database credentials"
cat > "$WWW/load.php" <