Navigation Menu

Skip to content

Commit

Permalink
More file structure changes
Browse files Browse the repository at this point in the history
Rename the www folder to html to make it generally more compatible standard webservice setups.

Update Docker deploy file
Update IDEA files

This should in theory work right out of the box now after running Docker Deploy and Composer Install
  • Loading branch information
cyberpower678 committed May 27, 2020
1 parent da0ced4 commit 36e9ee7
Show file tree
Hide file tree
Showing 422 changed files with 56 additions and 16 deletions.
9 changes: 8 additions & 1 deletion .idea/internetarchivebot.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/webResources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions app/src/Core/DB.php
Expand Up @@ -824,11 +824,12 @@ public static function createConfigurationTable() {
INDEX `WIKI` (`config_wiki` ASC),
INDEX `KEY` (`config_key` ASC));"
) ) {
echo "Unable to create a global configuration table. Table is required to setup the bot. Exiting...";
echo "Unable to create a global configuration table. Table is required to setup the bot. Exiting...\n";
exit( 10000 );
}
} else {
echo "Unable to connect to the database. Exiting...";
echo "Error " . mysqli_connect_errno() . ": " . mysqli_connect_error() . "\n";
echo "Unable to connect to the database. Exiting...\n";
exit( 20000 );
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/Core/init.php
Expand Up @@ -156,7 +156,7 @@
}
}

require_once( IABOTROOT . '../vendor/autoload.php' );
require_once( IABOTROOT . '../../vendor/autoload.php' );
if( isset( $accessibleWikis[WIKIPEDIA] ) && file_exists( IABOTROOT . 'extensions/' . WIKIPEDIA . '.php' ) ) {
require_once( IABOTROOT . 'extensions/' . WIKIPEDIA . '.php' );
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/deadlink.config.docker.inc.php
Expand Up @@ -71,7 +71,7 @@
//DO NOT MODIFY BELOW UNLESS YOU KNOW WHAT YOU ARE DOING

//Progress memory file. This allows the bot to resume where it left off in the event of a shutdown or a crash.
$memoryFile = "/var/www/html/memory/";
$memoryFile = "/var/www/memory/";

//DB connection setup
$host = "db";
Expand All @@ -80,4 +80,4 @@
$pass = getenv( "MYSQL_PASSWORD" );
$db = getenv( "MYSQL_DB" );

$publicHTMLPath = "www/";
$publicHTMLPath = "html/";
4 changes: 2 additions & 2 deletions app/src/deadlink.config.inc.php
Expand Up @@ -44,8 +44,8 @@
//Webapp variables
//These are defaults for the web interface portion of the bot.

//Directory path to the www/public_html directory.
$publicHTMLPath = "";
//Directory path to the public html directory.
$publicHTMLPath = "html/";

$disableInterface = false;
$interfaceMaster = [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion app/src/www/loader.php → app/src/html/loader.php
Expand Up @@ -71,7 +71,7 @@
error_reporting( E_COMPILE_ERROR | E_ERROR );
}

require_once( $path . '/Core/init.php' );
require_once( $path . 'Core/init.php' );

ini_set( 'memory_limit', '512M' );

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -2304,7 +2304,7 @@
global: !0,
processData: !0,
async: !0,
contentType: "application/x-www-form-urlencoded; charset=UTF-8",
contentType: "application/x-html-form-urlencoded; charset=UTF-8",
accepts: {
"*": Qb,
text: "text/plain",
Expand Down Expand Up @@ -2563,7 +2563,7 @@
return this[a] = !0, a
}
}), n.ajaxPrefilter("json jsonp", function (b, c, d) {
var e, f, g, h = b.jsonp !== !1 && (kc.test(b.url) ? "url" : "string" == typeof b.data && 0 === (b.contentType || "").indexOf("application/x-www-form-urlencoded") && kc.test(b.data) && "data");
var e, f, g, h = b.jsonp !== !1 && (kc.test(b.url) ? "url" : "string" == typeof b.data && 0 === (b.contentType || "").indexOf("application/x-html-form-urlencoded") && kc.test(b.data) && "data");
return h || "jsonp" === b.dataTypes[0] ? (e = b.jsonpCallback = n.isFunction(b.jsonpCallback) ? b.jsonpCallback() : b.jsonpCallback, h ? b[h] = b[h].replace(kc, "$1" + e) : b.jsonp !== !1 && (b.url += (Fb.test(b.url) ? "&" : "?") + b.jsonp + "=" + e), b.converters["script json"] = function () {
return g || n.error(e + " was not called"), g[0]
}, b.dataTypes[0] = "json", f = a[e], a[e] = function () {
Expand Down
Expand Up @@ -2304,7 +2304,7 @@
global: !0,
processData: !0,
async: !0,
contentType: "application/x-www-form-urlencoded; charset=UTF-8",
contentType: "application/x-html-form-urlencoded; charset=UTF-8",
accepts: {
"*": Qb,
text: "text/plain",
Expand Down Expand Up @@ -2563,7 +2563,7 @@
return this[a] = !0, a
}
}), n.ajaxPrefilter("json jsonp", function (b, c, d) {
var e, f, g, h = b.jsonp !== !1 && (kc.test(b.url) ? "url" : "string" == typeof b.data && 0 === (b.contentType || "").indexOf("application/x-www-form-urlencoded") && kc.test(b.data) && "data");
var e, f, g, h = b.jsonp !== !1 && (kc.test(b.url) ? "url" : "string" == typeof b.data && 0 === (b.contentType || "").indexOf("application/x-html-form-urlencoded") && kc.test(b.data) && "data");
return h || "jsonp" === b.dataTypes[0] ? (e = b.jsonpCallback = n.isFunction(b.jsonpCallback) ? b.jsonpCallback() : b.jsonpCallback, h ? b[h] = b[h].replace(kc, "$1" + e) : b.jsonp !== !1 && (b.url += (Fb.test(b.url) ? "&" : "?") + b.jsonp + "=" + e), b.converters["script json"] = function () {
return g || n.error(e + " was not called"), g[0]
}, b.dataTypes[0] = "json", f = a[e], a[e] = function () {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 36e9ee7

Please sign in to comment.