summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPhil Burton <phil@pgburton.com>2017-08-22 10:10:29 +0100
committerPhil Burton <phil@pgburton.com>2017-08-22 10:10:29 +0100
commit7b1e62d0cbc3519c469b2afd4da712125707de66 (patch)
tree06ee38c18849f9b0c85c2eb82bded824e2ff34e6 /scripts
parenta4170353515c254ab7404117e7d9b3f15887214a (diff)
parent47b154758e789e75ec597d88540cdb7f4e352225 (diff)
Merge branch 'master' of www.blatech.co.uk:FBeans/dipper
Diffstat (limited to 'scripts')
-rw-r--r--scripts/run.php89
-rw-r--r--scripts/test.php15
2 files changed, 5 insertions, 99 deletions
diff --git a/scripts/run.php b/scripts/run.php
index 3b4de6e..0ba999a 100644
--- a/scripts/run.php
+++ b/scripts/run.php
@@ -8,88 +8,9 @@ error_reporting(E_ALL);
require(realpath(dirname(__FILE__) . "/../bootstrap.php"));
// Set up siteroot
-define('DIPPER_ROOT', realpath(dirname(__FILE__) . "/../"));
+// TODO Don't rely on trailing slashes here
+define('DIPPER_ROOT', realpath(dirname(__FILE__) . "/../") . '/');
+define('SITES_ROOT', '/home/phil/sites/');
+define('CONFIG_ROOT', '/home/phil/sites/');
-// Handle options
-$options = getopt('d:n:');
-
-if (!array_key_exists('d', $options)) {
- finish("please provide a domain (-d)");
-}
-
-if (!array_key_exists('n', $options)) {
- finish("please provide a name (-n)");
-}
-
-/**
- * Exit application with optional mesage
- *
- * @author Phil Burton <phil@pgburton.com>
- * @param string $message [description]
- */
-function finish($message)
-{
- if ($message) {
- message($message);
- exit();
- }
-}
-
-/**
- * Echo a message
- *
- * @author Phil Burton <phil@pgburton.com>
- * @param string $message [description]
- */
-function message($message)
-{
- echo $message . PHP_EOL;
-}
-//
-// $domain = $options['d'];
-// $name = $options['n'];
-//
-// $conf = include_once('nginx.php');
-//
-// $conf = sprintf($conf[0], $domain, $name, $name, $name, $name, $name);
-//
-// echo "Making directory structure\n";
-//
-// if (!mkdir('/web/sites/' . $name)) {
-// echo "Failed to create '/web/sites/'" . $name . "\n";
-// exit(1);
-// }
-//
-// chown('/web/sites/' . $name, "nginx");
-//
-// if (!mkdir('/web/sites/' . $name . '/logs')) {
-// echo "Failed to create '/web/sites/'" . $name . "/logs\n";
-// exit(1);
-// }
-//
-// chown('/web/sites/' . $name . '/logs', "nginx");
-//
-//
-// if (!mkdir('/web/sites/' . $name . '/web')) {
-// echo "Failed to create '/web/sites/'" . $name . "/web\n";
-// exit(1);
-// }
-//
-// chown('/web/sites/' . $name . '/logs', "nginx");
-//
-// echo "Complete\n";
-//
-// if (!file_put_contents("/web/etc/nginx/" . $name . ".conf", $conf)) {
-// echo "Failed to write nginx conf\n";
-// }
-//
-// chown('/web/etc/nginx/' . $name . ".conf", "nginx");
-//
-// touch('/web/sites/' . $name . '/logs/' . $name . '.access_log');
-// chown('/web/sites/' . $name . '/logs/' . $name . '.access_log', "nginx");
-//
-// touch('/web/sites/' . $name . '/logs/' . $name . '.error_log');
-// chown('/web/sites/' . $name . '/logs/' . $name . '.error_log', "nginx");
-//
-// touch('/web/sites/' . $name . '/web/index.php');
-// chown('/web/sites/' . $name . '/web/index.php', "nginx");
+new App\Script\Console;
diff --git a/scripts/test.php b/scripts/test.php
deleted file mode 100644
index f1203ce..0000000
--- a/scripts/test.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-ini_set("display_errors", 1);
-ini_set("display_startup_errors", 1);
-error_reporting(E_ALL);
-
-// Pull in bootstrap
-require(realpath(dirname(__FILE__) . "/../bootstrap.php"));
-
-// Set up siteroot
-define('DIPPER_ROOT', realpath(dirname(__FILE__) . "/../"));
-define('SITES_ROOT', '/home/phil/sites/');
-define('CONFIG_ROOT', '/home/phil/sites/');
-
-new App\Script\Console;