diff --git a/Vagrantfile b/Vagrantfile index 853daba0fe..e5f30b307f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -37,7 +37,7 @@ Vagrant.configure(2) do |config| end # 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: "once" end diff --git a/util/friendica-to-smarty-tpl.py b/bin/dev/friendica-to-smarty-tpl.py similarity index 100% rename from util/friendica-to-smarty-tpl.py rename to bin/dev/friendica-to-smarty-tpl.py diff --git a/util/make_credits.py b/bin/dev/make_credits.py similarity index 100% rename from util/make_credits.py rename to bin/dev/make_credits.py diff --git a/util/minifyjs.sh b/bin/dev/minifyjs.sh similarity index 100% rename from util/minifyjs.sh rename to bin/dev/minifyjs.sh diff --git a/util/updatetpl.py b/bin/dev/updatetpl.py similarity index 100% rename from util/updatetpl.py rename to bin/dev/updatetpl.py diff --git a/util/vagrant_provision.sh b/bin/dev/vagrant_provision.sh similarity index 98% rename from util/vagrant_provision.sh rename to bin/dev/vagrant_provision.sh index 836d12368b..fc3e266f2e 100755 --- a/util/vagrant_provision.sh +++ b/bin/dev/vagrant_provision.sh @@ -35,7 +35,7 @@ sudo openssl x509 -req -days 365 -in "$SSL_DIR/xip.io.csr" -signkey "$SSL_DIR/xi echo ">>> Installing Apache2 webserver" sudo apt-get install -y apache2 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 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 diff --git a/util/vagrant_vhost.sh b/bin/dev/vagrant_vhost.sh similarity index 100% rename from util/vagrant_vhost.sh rename to bin/dev/vagrant_vhost.sh