MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Moved .htconfig.php file & extracted Install business logic"

Browse source
This commit is contained in:
Tobias Diekershoff 2018-04-21 16:28:22 +02:00 • committed by GitHub
commit f63be91bd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 324 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/auth_ejabberd.php
View file

@ -57,7 +57,7 @@ require_once "include/dba.php";
$a = new App(dirname(__DIR__));
BaseObject::setApp($a);
@include "config/.htconfig.php";
@include ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);

2
bin/daemon.php
View file

@ -38,7 +38,7 @@ if (substr($directory, 0, 1) != "/") {
}
$directory = realpath($directory."/..");
@include($directory."/config/.htconfig.php");
@include($directory."/.htconfig.php");
if (!isset($pidfile)) {
die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n".

2
bin/dev/vagrant_provision.sh
View file

@ -86,7 +86,7 @@ cd /var/www
php bin/composer.phar install
# initial config file for friendica in vagrant
cp /vagrant/util/htconfig.vagrant.php /vagrant/config/.htconfig.php
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

2
bin/worker.php
View file

@ -29,7 +29,7 @@ require_once "include/dba.php";
$a = new App(dirname(__DIR__));
BaseObject::setApp($a);
require_once "config/.htconfig.php";
require_once ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);