Merge pull request #3922 from annando/scripts2
One script needed to be moved, one script was obsolete
This commit is contained in:
commit
158cc9dc45
2 changed files with 6 additions and 46 deletions
|
@ -13,14 +13,14 @@
|
|||
* Installation:
|
||||
*
|
||||
* - Change it's owner to whichever user is running the server, ie. ejabberd
|
||||
* $ chown ejabberd:ejabberd /path/to/friendica/include/auth_ejabberd.php
|
||||
* $ chown ejabberd:ejabberd /path/to/friendica/scripts/auth_ejabberd.php
|
||||
*
|
||||
* - Change the access mode so it is readable only to the user ejabberd and has exec
|
||||
* $ chmod 700 /path/to/friendica/include/auth_ejabberd.php
|
||||
* $ chmod 700 /path/to/friendica/scripts/auth_ejabberd.php
|
||||
*
|
||||
* - Edit your ejabberd.cfg file, comment out your auth_method and add:
|
||||
* {auth_method, external}.
|
||||
* {extauth_program, "/path/to/friendica/include/auth_ejabberd.php"}.
|
||||
* {extauth_program, "/path/to/friendica/script/auth_ejabberd.php"}.
|
||||
*
|
||||
* - Restart your ejabberd service, you should be able to login with your friendica auth info
|
||||
*
|
||||
|
@ -47,16 +47,13 @@ if (substr($directory, 0, 1) != "/")
|
|||
$directory = realpath($directory."/..");
|
||||
|
||||
chdir($directory);
|
||||
require_once("boot.php");
|
||||
|
||||
global $a;
|
||||
require_once "boot.php";
|
||||
require_once "include/dba.php";
|
||||
|
||||
if (empty($a)) {
|
||||
$a = new App(dirname(__DIR__));
|
||||
}
|
||||
|
||||
@include(".htconfig.php");
|
||||
require_once("include/dba.php");
|
||||
dba::connect($db_host, $db_user, $db_pass, $db_data);
|
||||
unset($db_host, $db_user, $db_pass, $db_data);
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @package util
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
/*
|
||||
* require boot.php
|
||||
*/
|
||||
require_once("boot.php");
|
||||
|
||||
if (empty($a)) {
|
||||
$a = new App(dirname(__DIR__));
|
||||
}
|
||||
@include(".htconfig.php");
|
||||
|
||||
$lang = get_browser_language();
|
||||
load_translation_table($lang);
|
||||
|
||||
require_once("include/dba.php");
|
||||
dba::connect($db_host, $db_user, $db_pass, $db_data, false);
|
||||
unset($db_host, $db_user, $db_pass, $db_data);
|
||||
|
||||
$build = Config::get('system', 'build');
|
||||
|
||||
echo "Old DB VERSION: " . $build . "\n";
|
||||
echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
|
||||
|
||||
|
||||
if ($build != DB_UPDATE_VERSION) {
|
||||
echo "Updating database...";
|
||||
update_db($a);
|
||||
echo "Done\n";
|
||||
}
|
Loading…
Reference in a new issue