Verified Commit f60538f6 authored by Mattia Rizzolo's avatar Mattia Rizzolo

Merge branch 'vagrant' of salsa.debian.org:allentiak-guest/udd

MR: !17Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parents f682b037 d305daf9
......@@ -2,7 +2,7 @@
# vi: set ft=ruby :
Vagrant.configure(2) do |config|
config.vm.box = "debian/contrib-stretch64"
config.vm.box = "debian/stretch"
config.vm.network "forwarded_port", guest: 80, host: 8080
......
......@@ -27,7 +27,7 @@ sudo -u postgres createdb -T template0 -E SQL_ASCII udd
# create the database, named 'udd', forcing the encoding to SQL_ASCII, since that's the format of the export.
# We base it off 'template0' because 'template1' (the default) might be set to UTF8 which prevents creation
# of new SQL_ASCII databases.
sudo -upostgres psql udd -c 'CREATE EXTENSION debversion'
sudo -u postgres psql udd -c 'CREATE EXTENSION debversion'
# Also create a guest user (used by CGIs)
sudo -u postgres dropuser guest || true
sudo -u postgres createuser -lDRS guest
......@@ -41,10 +41,11 @@ sudo ln -sf /vagrant/vagrant/apache.conf /etc/apache2/sites-enabled/000-default.
sudo ln -sf /etc/apache2/mods-available/cgi.load /etc/apache2/mods-enabled/
sudo ln -sf /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled/
sudo rm -f /etc/apache2/conf-enabled/serve-cgi-bin.conf
#
# Run apache2 as the vagrant user. Yes, eek. But this avoids all permission problems.
sudo sed -i 's/APACHE_RUN_USER=www-data/APACHE_RUN_USER=vagrant/' /etc/apache2/envvars
sudo sed -i 's/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=vagrant/' /etc/apache2/envvars
sudo chown -R vagrant:vagrant /var/log/apache2
sudo chown -R vagrant:vagrant /var/lock/apache2
sudo service apache2 restart
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment