From 9518145377dce4fe2daca8f29fadc5a61c0b6f06 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 18 Jul 2018 21:32:24 +0200 Subject: [PATCH] switch the Vagrant VM to the new config system (#5396) --- bin/dev/vagrant_provision.sh | 3 +- util/htconfig.vagrant.php | 76 ------------------------------------ util/local.ini.vagrant.php | 41 +++++++++++++++++++ 3 files changed, 43 insertions(+), 77 deletions(-) delete mode 100644 util/htconfig.vagrant.php create mode 100644 util/local.ini.vagrant.php diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh index fc3e266f2e..0599efa0c5 100755 --- a/bin/dev/vagrant_provision.sh +++ b/bin/dev/vagrant_provision.sh @@ -86,7 +86,8 @@ cd /var/www php bin/composer.phar install # initial config file for friendica in vagrant -cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php +#cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php +cp /vagrant/util/local.ini.vagrant.php /vagrant/config/local.ini.php # create the friendica database echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | $MYSQL -u root -proot diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php deleted file mode 100644 index f75e208ee5..0000000000 --- a/util/htconfig.vagrant.php +++ /dev/null @@ -1,76 +0,0 @@ -urlpath = ''; - -// 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'] = 'admin@friendica.local'; - -// 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'; - - -// Server-to-server private message encryption (RINO) is allowed by default. -// set to 0 to disable, 1 to enable - -$a->config['system']['rino_encrypt'] = 1; - -// default system theme - -$a->config['system']['theme'] = 'duepuntozero'; - -// By default allow pseudonyms - -$a->config['system']['no_regfullname'] = true; - -//Deny public access to the local directory -//$a->config['system']['block_local_dir'] = false; - -// Location of the global directory -$a->config['system']['directory'] = 'https://dir.friendica.social'; - -// turn on friendica's log -$a->config['system']['debugging'] = true; -$a->config['system']['logfile'] = 'logfile.out'; -$a->config['system']['loglevel'] = LOGGER_DEBUG; - -// display php errors -ini_set('display_errors', '1'); diff --git a/util/local.ini.vagrant.php b/util/local.ini.vagrant.php new file mode 100644 index 0000000000..9d3a5f4305 --- /dev/null +++ b/util/local.ini.vagrant.php @@ -0,0 +1,41 @@ +