diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..03eb613 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM php:5-apache +MAINTAINER Skylar Ittner +RUN apt-get update && apt-get upgrade -y +RUN apt-get install git openssh-server +# nuke the webroot +WORKDIR /var/www +RUN rm -rf html && mkdir html +WORKDIR /var/www/html +# install the server crap (private repo for now, thx GitHub Student) +RUN git clone https://skylarmt-script-account:scriptb0t@github.com/skylarmt/TerranQuestServer.git . +# 0wn3d +RUN cd .. && chown -R www-data:www-data html \ No newline at end of file diff --git a/code2item.php b/code2item.php index 3ac00fa..a4abe2d 100644 --- a/code2item.php +++ b/code2item.php @@ -1,8 +1,2 @@ 'mysql', +'database_name' => 'c0terranquest', +'server' => 'localhost', +'username' => 'c0terranquest', +'password' => 'qinkifTQ!OMY2', +'charset' => 'utf8' +]); \ No newline at end of file diff --git a/index.html b/index.html deleted file mode 100644 index 186ea25..0000000 --- a/index.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - Welcome! - - - - - - -
- -
-

This is the default index page of your website.

-

This file may be deleted or overwritten without any difficulty. This is produced by the file index.html in the web directory.

-

For questions or problems please contact support.

-
- -
- - diff --git a/index.php b/index.php index d3aa100..d6fd87c 100644 --- a/index.php +++ b/index.php @@ -10,8 +10,7 @@ and open the template in the editor. - +

TerranQuest Game Server

+

This service is not designed to be accessed directly; download the TerranQuest app instead. diff --git a/required.php b/required.php index 4d9328d..d82b967 100644 --- a/required.php +++ b/required.php @@ -23,14 +23,7 @@ require 'response.php'; // Also inits database and stuff $database; try { - $database = new medoo([ - 'database_type' => 'mysql', - 'database_name' => 'c0terranquest', - 'server' => 'localhost', - 'username' => 'c0terranquest', - 'password' => 'qinkifTQ!OMY2', - 'charset' => 'utf8' - ]); + require 'dbsettings.php'; } catch (Exception $ex) { header('HTTP/1.1 500 Internal Server Error'); sendError('Database error. Try again later.', true);