Merge pull request #10826 from nupplaphil/bug/run_xgettext

[friendica.git] / bin / dev / vagrant_provision.sh

diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh
index a7cb7f308dc88be243566589d8661d0d19f6013b..2dc386a4b42641a6e5c3e5101edc5033c965fa05 100755 (executable)
--- a/bin/dev/vagrant_provision.sh
+++ b/bin/dev/vagrant_provision.sh
@@ -82,7 +82,7 @@ echo ">>> Installing 'Local Only' postfix"
 debconf-set-selections <<< "postfix postfix/mailname string friendica.local"
 debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Local Only'"
 apt-get install -qq postfix mailutils libmailutils-dev
-echo -e "friendica1:   vagrant\nfriendica2:    vagrant\nfriendica3:    vagrant\nfriendica4:    vagrant\nfriendica5:    vagrant" >> /etc/aliases && newaliases
+echo -e "$ADMIN_NICK:  vagrant\n$USER_NICK:    vagrant" >> /etc/aliases && newaliases
 
 # Friendica needs git for fetching some dependencies
 echo ">>> Installing git"
@@ -93,9 +93,8 @@ echo ">>> Symlink /var/www to /vagrant"
 rm -rf /var/www/
 ln -fs /vagrant /var/www
 
-# install deps with composer
+# Setup Friendica
 cd /var/www
-
 echo ">>> Setup Friendica"
 
 # copy the .htaccess-dist file to .htaccess so that rewrite rules work
@@ -116,10 +115,6 @@ bin/console user password "$ADMIN_NICK" "$ADMIN_PASSW"
 bin/console user add "$USER_NICK" "$USER_NICK" "$USER_NICK@friendica.local" en
 bin/console user password "$USER_NICK" "$USER_PASSW"
 
-# set the admin
-bin/console config config admin_email ""$ADMIN_NICK@friendica.local""
-
-
 # create cronjob - activate if you have enough memory in you dev VM
 # cronjob runs as www-data user
 echo ">>> Installing cronjob"