Merge pull request #4773 from MrPetovan/task/4629-move-dev-executables
Move dev executables to bin/dev/
This commit is contained in:
commit
7f0bd63b7d
2
Vagrantfile
vendored
2
Vagrantfile
vendored
|
@ -37,7 +37,7 @@ Vagrant.configure(2) do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Enable provisioning with a shell script.
|
# Enable provisioning with a shell script.
|
||||||
config.vm.provision "shell", path: "./util/vagrant_provision.sh"
|
config.vm.provision "shell", path: "./bin/dev/vagrant_provision.sh"
|
||||||
# run: "always"
|
# run: "always"
|
||||||
# run: "once"
|
# run: "once"
|
||||||
end
|
end
|
||||||
|
|
|
@ -35,7 +35,7 @@ sudo openssl x509 -req -days 365 -in "$SSL_DIR/xip.io.csr" -signkey "$SSL_DIR/xi
|
||||||
echo ">>> Installing Apache2 webserver"
|
echo ">>> Installing Apache2 webserver"
|
||||||
sudo apt-get install -y apache2
|
sudo apt-get install -y apache2
|
||||||
sudo a2enmod rewrite actions ssl
|
sudo a2enmod rewrite actions ssl
|
||||||
sudo cp /vagrant/util/vagrant_vhost.sh /usr/local/bin/vhost
|
sudo cp /vagrant/bin/dev/vagrant_vhost.sh /usr/local/bin/vhost
|
||||||
sudo chmod guo+x /usr/local/bin/vhost
|
sudo chmod guo+x /usr/local/bin/vhost
|
||||||
sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica.local
|
sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica.local
|
||||||
sudo a2dissite 000-default
|
sudo a2dissite 000-default
|
Loading…
Reference in a new issue