From 663b6e9300bfe19dceef9167bb72e92d9fa5ce48 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Mon, 4 Sep 2017 12:35:22 +0200 Subject: [PATCH 1/2] do not import test sql for the moment --- util/vagrant_provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh index 39db0d73c..6ad02f397 100644 --- a/util/vagrant_provision.sh +++ b/util/vagrant_provision.sh @@ -102,7 +102,7 @@ cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php # create the friendica database echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | mysql -u root -proot # import test database -$MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql +# $MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql #create cronjob echo "*/10 * * * * cd /vagrant; /usr/bin/php include/poller.php" >> friendicacron From 50cec46d1fcce96d9710d67fc170ad424da316a4 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Wed, 6 Sep 2017 10:00:06 +0200 Subject: [PATCH 2/2] Vagrant only for Xenial, more RAM for debugging, no poller --- Vagrantfile | 56 +++++++++++---------------------------- util/vagrant_provision.sh | 49 +++++++++++----------------------- 2 files changed, 31 insertions(+), 74 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3d58ef7a5..df019dd06 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,54 +1,30 @@ -server_ip_trusty = "192.168.22.10" -server_ip_xenial = "192.168.22.11" -server_memory = "1024" # MB +server_ip = "192.168.22.10" +server_memory = "2048" # MB server_timezone = "UTC" public_folder = "/vagrant" Vagrant.configure(2) do |config| -###################################################################### - # Set server to Ubuntu 14.04 - config.vm.define "trusty" do |trusty| - trusty.vm.box = "ubuntu/trusty64" - - # Disable automatic box update checking. If you disable this, then - # boxes will only be checked for updates when the user runs - # `vagrant box outdated`. This is not recommended. - # config.vm.box_check_update = false - - # Create a hostname, don't forget to put it to the `hosts` file - # This will point to the server's default virtual host - # TO DO: Make this work with virtualhost along-side xip.io URL - trusty.vm.hostname = "friendica-trusty.dev" - - # Create a static IP - trusty.vm.network :private_network, ip: server_ip_trusty - end - -###################################################################### # Set server to Ubuntu 16.04 - config.vm.define "xenial" do |xenial| - xenial.vm.box = "boxcutter/ubuntu1604" + config.vm.box = "ubuntu/xenial64" - # Disable automatic box update checking. If you disable this, then - # boxes will only be checked for updates when the user runs - # `vagrant box outdated`. This is not recommended. - # config.vm.box_check_update = false + # Disable automatic box update checking. If you disable this, then + # boxes will only be checked for updates when the user runs + # `vagrant box outdated`. This is not recommended. + config.vm.box_check_update = true - # Create a hostname, don't forget to put it to the `hosts` file - # This will point to the server's default virtual host - # TO DO: Make this work with virtualhost along-side xip.io URL - xenial.vm.hostname = "friendica-xenial.dev" + # Create a hostname, don't forget to put it to the `hosts` file + # This will point to the server's default virtual host + # TO DO: Make this work with virtualhost along-side xip.io URL + config.vm.hostname = "friendica-xenial.dev" - # Create a static IP - xenial.vm.network :private_network, ip: server_ip_xenial - end + # Create a static IP + config.vm.network :private_network, ip: server_ip -###################################################################### # Share a folder between host and guest - config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "vagrant" - + # config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "vagrant" + config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "www-data" # Provider-specific configuration so you can fine-tune various # backing providers for Vagrant. These expose provider-specific options. @@ -57,7 +33,7 @@ Vagrant.configure(2) do |config| # vb.gui = true # # # Customize the amount of memory on the VM: - vb.memory = server_memory + vb.memory = server_memory end # Enable provisioning with a shell script. diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh index 6ad02f397..0cdddc58c 100644 --- a/util/vagrant_provision.sh +++ b/util/vagrant_provision.sh @@ -6,6 +6,9 @@ echo "Friendica configuration settings" sudo apt-get update +# Install virtualbox guest additions +sudo apt-get install virtualbox-guest-x11 + #Selfsigned cert echo ">>> Installing *.xip.io self-signed SSL" SSL_DIR="/etc/ssl/xip.io" @@ -32,30 +35,16 @@ sudo apt-get install -y apache2 sudo a2enmod rewrite actions ssl sudo cp /vagrant/util/vagrant_vhost.sh /usr/local/bin/vhost sudo chmod guo+x /usr/local/bin/vhost -if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then - sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica-trusty.dev + sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica-xenial.dev sudo a2dissite 000-default sudo service apache2 restart -elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then - sudo vhost -s 192.168.22.11.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica-xenial.dev - sudo a2dissite 000-default - sudo systemctl restart apache2 -fi #Install php -if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then - echo ">>> Installing PHP5" - sudo apt-get install -y php5 libapache2-mod-php5 php5-cli php5-mysql php5-curl php5-gd - sudo apt-get install -y imagemagick - sudo apt-get install -y php5-imagick - sudo service apache2 restart -elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then - echo ">>> Installing PHP7" - sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring - sudo apt-get install -y imagemagick - sudo apt-get install -y php-imagick - sudo systemctl restart apache2 -fi +echo ">>> Installing PHP7" +sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring +sudo apt-get install -y imagemagick +sudo apt-get install -y php-imagick +sudo systemctl restart apache2 #Install mysql @@ -73,21 +62,13 @@ Q1="GRANT ALL ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;" Q2="FLUSH PRIVILEGES;" SQL="${Q1}${Q2}" $MYSQL -uroot -proot -e "$SQL" -if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then - service mysql restart -elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then - systemctl restart mysql -fi +systemctl restart mysql #configure rudimentary mail server (local delivery only) #add Friendica accounts for local user accounts, use email address like vagrant@friendica.dev, read the email with 'mail'. -if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then - debconf-set-selections <<< "postfix postfix/mailname string friendica-trusty.dev" -elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then - debconf-set-selections <<< "postfix postfix/mailname string friendica-xenial.dev" -fi +debconf-set-selections <<< "postfix postfix/mailname string friendica-xenial.dev" debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Local Only'" sudo apt-get install -y postfix mailutils libmailutils-dev sudo echo -e "friendica1: vagrant\nfriendica2: vagrant\nfriendica3: vagrant\nfriendica4: vagrant\nfriendica5: vagrant" >> /etc/aliases && sudo newaliases @@ -104,10 +85,10 @@ echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_ge # import test database # $MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql -#create cronjob -echo "*/10 * * * * cd /vagrant; /usr/bin/php include/poller.php" >> friendicacron -sudo crontab friendicacron -sudo rm friendicacron +# create cronjob - activate if you have enough memory in you dev VM +# echo "*/10 * * * * cd /vagrant; /usr/bin/php include/poller.php" >> friendicacron +# sudo crontab friendicacron +# sudo rm friendicacron #Optional: checkout addon repositroy #sudo git clone https://github.com/friendica/friendica-addons.git /vagrant/addon