...
 
Commits (2)
......@@ -7,10 +7,10 @@ RUN apt-get update && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
# Copy the current directory contents into the container at /app
COPY docker/provision.sh .
COPY virtualization/provision.sh .
# Install any needed packages specified in requirements.txt
RUN ./provision.sh
RUN ./provision.sh docker
# Make HTTP port 80 available to the world outside this container
EXPOSE 80
......
......@@ -10,7 +10,7 @@ Vagrant.configure(2) do |config|
vb.memory = "4096"
end
config.vm.provision :shell, path: "vagrant/provision.sh", args: "'vagrant'"
config.vm.provision :shell, path: "viztualization/provision.sh", args: "'vagrant'"
# Forward agent when doing 'vagrant ssh' (needed for tunnels to ullmann/alioth)
config.ssh.forward_agent = true
......
......@@ -26,7 +26,7 @@ sudo service postgresql restart
# create and configure UDD database
sudo -u postgres dropuser udd || true
sudo -u postgres createuser -DRS udd
sudo -u postgres dropuser vagrant || true
sudo -u postgres dropuser $1 || true
sudo -u postgres createuser -DRS $1
sudo -u postgres dropdb udd || true
sudo -u postgres createdb -T template0 -E SQL_ASCII udd
......@@ -43,7 +43,7 @@ sudo mkdir -p /srv/udd.debian.org/
sudo ln -sfn /vagrant /srv/udd.debian.org/udd
# Apache setup
sudo ln -sf /vagrant/vagrant/apache.conf /etc/apache2/sites-enabled/000-default.conf
sudo ln -sf /vagrant/virtualization/apache.conf /etc/apache2/sites-enabled/000-default.conf
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
......