james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure we install the php5 postgres drivers.

Browse Source
This commit is contained in:
jgen 2014-02-22 19:44:50 -05:00
parent 8bbaf85114
commit 6da5f27447
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
install.php
View File

@ -3,28 +3,32 @@
* Shimmie Installer * Shimmie Installer
* *
* @package Shimmie * @package Shimmie
* @author Shish et al. <webmaster at shishnet.org> * @copyright Copyright (c) 2007-2014, Shish et al.
* @author Shish <webmaster at shishnet.org>, jgen <jeffgenovy at gmail.com>
* @link http://code.shishnet.org/shimmie2/ * @link http://code.shishnet.org/shimmie2/
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
* @copyright Copyright (c) 2007-2014, Shish et al. *
*/ */
// TODO: Rewrite the entire installer and make it more readable. // TODO: Rewrite the entire installer and make it more readable.
ob_start(); ob_start();
/*
<!--
- install.php (c) Shish et all. 2007-2013
-
- Initialise the database, check that folder
- permissions are set properly.
-
- This file should be independant of the database
- and other such things that aren't ready yet
-->
*/
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!-- Shimmie (c) Shish et all. 2007-2013 -->
- install.php (c) Shish et all. 2007-2013
-
- Initialise the database, check that folder
- permissions are set properly.
-
- This file should be independant of the database
- and other such things that aren't ready yet
-->
<head> <head>
<title>Shimmie Installation</title> <title>Shimmie Installation</title>
<link rel="shortcut icon" href="favicon.ico" /> <link rel="shortcut icon" href="favicon.ico" />
@ -37,7 +41,7 @@ ob_start();
<h1>Install Error</h1> <h1>Install Error</h1>
<p>Shimmie needs to be run via a web server with PHP support -- you <p>Shimmie needs to be run via a web server with PHP support -- you
appear to be either opening the file from your hard disk, or your appear to be either opening the file from your hard disk, or your
web server is mis-configured.</p> web server is mis-configured and doesn't know how to handle PHP files.</p>
<p>If you've installed a web server on your desktop PC, you probably <p>If you've installed a web server on your desktop PC, you probably
want to visit <a href="http://localhost/">the local web server</a>.<br/><br/> want to visit <a href="http://localhost/">the local web server</a>.<br/><br/>
</p> </p>
@ -454,7 +458,7 @@ function write_config() { // {{{
<p><textarea cols="80" rows="2">$file_content</textarea> <p><textarea cols="80" rows="2">$file_content</textarea>
<p>Once done, <a href="index.php">Continue</a> <p>Once done, <a href="index.php">Click here to Continue</a>.
<br/><br/> <br/><br/>
</div> </div>
EOD; EOD;

2
tests/setup_test_env.sh
View File

@ -11,7 +11,7 @@
set -e set -e
# Install the necessary packages # Install the necessary packages
sudo apt-get install -y nginx php5-fpm php5-mysql realpath --fix-missing sudo apt-get install -y nginx php5-fpm php5-mysql php5-pgsql realpath --fix-missing
# Stop the daemons # Stop the daemons
sudo service nginx stop sudo service nginx stop