nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4773 from MrPetovan/task/4629-move-dev-executables

Browse source 
Move dev executables to bin/dev/
This commit is contained in:
Michael Vogel 2018-04-08 07:44:24 +02:00 committed by GitHub
commit 7f0bd63b7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Vagrantfile vendored
View file

@ -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

0
util/friendica-to-smarty-tpl.py → bin/dev/friendica-to-smarty-tpl.py
View file

0
util/make_credits.py → bin/dev/make_credits.py
View file

0
util/minifyjs.sh → bin/dev/minifyjs.sh
View file

0
util/updatetpl.py → bin/dev/updatetpl.py
View file

2
util/vagrant_provision.sh → bin/dev/vagrant_provision.sh
View file

@ -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

0
util/vagrant_vhost.sh → bin/dev/vagrant_vhost.sh
View file