From c56ccd225cee6a73cb06bb3bd45324f63a843ea2 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Thu, 23 Jul 2015 22:06:18 +0200 Subject: [PATCH] Vagrant user doesn't have to tun the actual installation anymore. Test database is imported, htconfig is set, not generated to prevent installation routine. --- util/htconfig.vagrant.php | 71 +++++++++++++++++++++++++++++++++++++++ util/vagrant_provision.sh | 13 ++++--- 2 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 util/htconfig.vagrant.php diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php new file mode 100644 index 0000000000..36fd4b9c91 --- /dev/null +++ b/util/htconfig.vagrant.php @@ -0,0 +1,71 @@ +path = ''; + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = 'Europe/Berlin'; + +// What is your site name? + +$a->config['sitename'] = "My Friend Network"; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['register_policy'] = REGISTER_OPEN; +$a->config['register_text'] = ''; +$a->config['admin_email'] = 'vagrant@friendica.dev'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['php_path'] = '/usr/bin/php'; + +// Location of global directory submission page. + +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; + +// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts + +$a->config['system']['huburl'] = '[internal]'; + +// Server-to-server private message encryption (RINO) is allowed by default. +// Encryption will only be provided if this setting is true and the +// PHP mcrypt extension is installed on both systems + +$a->config['system']['rino_encrypt'] = true; + +// default system theme + +$a->config['system']['theme'] = 'duepuntozero'; + +// By default allow pseudonyms + +$a->config['system']['no_regfullname'] = true; diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh index b964d22431..ac24659662 100644 --- a/util/vagrant_provision.sh +++ b/util/vagrant_provision.sh @@ -63,6 +63,7 @@ SQL="${Q1}${Q2}" $MYSQL -uroot -proot -e "$SQL" service mysql restart + #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'. debconf-set-selections <<< "postfix postfix/mailname string friendica.dev" @@ -74,15 +75,13 @@ sudo echo -e "friendica1: vagrant\nfriendica2: vagrant\nfriendica3: vagrant\nfri sudo rm -rf /var/www/ sudo ln -fs /vagrant /var/www -#delete .htconfig.php file if it exists to have a fresh friendica -#installation -if [ -f /vagrant/.htconfig.php ] - then - sudo rm /vagrant/.htconfig.php -fi +# initial config file for friendica in vagrant +cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php -#create the friendica database +# create the friendica database echo "create database friendica" | mysql -u root -proot +# 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 -- 2.39.5