switch the Vagrant VM to the new config system (#5396)
This commit is contained in:
Hypolite Petovan
parent
2d0446bd38
commit
9518145377
3 changed files with 43 additions and 77 deletions
|
|
@ -86,7 +86,8 @@ cd /var/www
|
||||||
php bin/composer.phar install
|
php bin/composer.phar install
|
||||||
|
|
||||||
# initial config file for friendica in vagrant
|
# 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
|
# create the friendica database
|
||||||
echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | $MYSQL -u root -proot
|
echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | $MYSQL -u root -proot
|
||||||
|
|
|
||||||
|
|
@ -1,76 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
// Set the following for your MySQL installation
|
|
||||||
// Copy or rename this file to .htconfig.php
|
|
||||||
|
|
||||||
$db_host = 'localhost';
|
|
||||||
$db_user = 'friendica';
|
|
||||||
$db_pass = 'friendica';
|
|
||||||
$db_data = 'friendica';
|
|
||||||
|
|
||||||
// If you are using a subdirectory of your domain you will need to put the
|
|
||||||
// relative path (from the root of your domain) here.
|
|
||||||
// For instance if your URL is 'http://example.com/directory/subdirectory',
|
|
||||||
// set path to 'directory/subdirectory'.
|
|
||||||
|
|
||||||
$a->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');
|
|
||||||
41
util/local.ini.vagrant.php
Normal file
41
util/local.ini.vagrant.php
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?php return <<<INI
|
||||||
|
|
||||||
|
; If automatic system installation fails:
|
||||||
|
|
||||||
|
; Copy this file to local.ini.php
|
||||||
|
|
||||||
|
; Why local.ini.php? Because it contains sensitive information which could
|
||||||
|
; give somebody complete control of your database. Apache's default
|
||||||
|
; configuration will interpret any .php file as a script and won't show the values
|
||||||
|
|
||||||
|
; Then set the following for your MySQL installation
|
||||||
|
|
||||||
|
[database]
|
||||||
|
hostname = localhost
|
||||||
|
username = friendica
|
||||||
|
password = friendica
|
||||||
|
database = friendica
|
||||||
|
charset = utf8mb4
|
||||||
|
|
||||||
|
|
||||||
|
; ****************************************************************
|
||||||
|
; The configuration below will be overruled by the admin panel.
|
||||||
|
; Changes made below will only have an effect if the database does
|
||||||
|
; not contain any configuration for the friendica system.
|
||||||
|
; ****************************************************************
|
||||||
|
|
||||||
|
[config]
|
||||||
|
admin_email = admin@friendica.local
|
||||||
|
|
||||||
|
sitename = Friendica Social Network
|
||||||
|
|
||||||
|
register_policy = REGISTER_OPEN
|
||||||
|
register_text =
|
||||||
|
|
||||||
|
[system]
|
||||||
|
default_timezone = UTC
|
||||||
|
|
||||||
|
language = en
|
||||||
|
|
||||||
|
INI;
|
||||||
|
// Keep this line
|
||||||
Loading…
Reference in a new issue