Changeset 1104

Timestamp:

09/07/08 14:11:01 (3 months ago)

Author:

arnoschn

Message:

adding test-url to ci-config.yaml

Files:

• branches/arnoschn/cache/lib/utils/scripts/ci-test.php (modified) (5 diffs)

branches/arnoschn/cache/lib/utils/scripts/ci-test.php

@@ -185 +185 @@
-            $this->_createCiPhpConfigFile();
-        }
-
+$returnVal = $this->_checkWebserver2($this->settings['test-url']) && $returnVal;
-        return $returnVal;
-        // if all passes return true
@@ -204 +204 @@
-        return true;
-    }
+    function _checkWebserver2($url)
+    {
+        $return = true;
+        $testIndexPage = @file_get_contents($url.'/');
+        if ($testIndexPage!='Test::page::index') {
+            $this->error('Webserver Configuration problems:'."\n" .$testIndexPage."\n\n");
+            $return = false;
+        } else {
+            $this->info('Web Server is configured correctly');
+        }
+        return $return;
+    }
+    
-    function _checkWebServer($url)
-    {
@@ -245 +258 @@
-        $this->info('Web Server is reachable at '.$url);
-        
-
-
-
-
-
-
-
+
-
-        return $return;
@@ -324 +331 @@
-        $file = AK_BASE_DIR.DS.'config'.DS.'ci-config.php';
-        $settings = array();
-
-
+
-        return file_put_contents($file,str_replace(array_keys($settings),array_values($settings),file_get_contents($templateFile)))>0;
-    }
@@ -337 +343 @@
-        $settings['${php4}'] = $this->_promptForPhp('php4');
-        $settings['${php5}'] = $this->_promptForPhp('php5');
+        $settings['${test-url}'] = $this->_promptForTestingUrl();
-        return file_put_contents($file,str_replace(array_keys($settings),array_values($settings),file_get_contents($templateFile)))>0;
-    }