badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
*
* @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/
* @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.
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>
<html>
<!--
- 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
-->
<!-- Shimmie (c) Shish et all. 2007-2013 -->
<head>
<title>Shimmie Installation</title>
<link rel="shortcut icon" href="favicon.ico" />
@ -37,7 +41,7 @@ ob_start();
<h1>Install Error</h1>
<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
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
want to visit <a href="http://localhost/">the local web server</a>.<br/><br/>
</p>
@ -454,7 +458,7 @@ function write_config() { // {{{
<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/>
</div>
EOD;

2
tests/setup_test_env.sh
View file

@ -11,7 +11,7 @@
set -e
# 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
sudo service nginx stop