Browse files

Updated README.md / Fixed .gitignore conflicts / Added Debian localhost

  • Loading branch information...
1 parent 38aadc5 commit 5c3ed4fc40a5ce2d77fa0ce90d555d4241f150b3 @codeinthehole committed Feb 22, 2011
Showing with 29 additions and 19 deletions.
  1. +1 −8 .gitignore
  2. +27 −10 README.md
  3. +1 −1 web/app_dev.php
View
9 .gitignore
@@ -2,15 +2,8 @@
/vendor_full/
/app/cache/*
/app/logs/*
-<<<<<<< HEAD
-
-# Ignore Eclipse specific files
+*.swp
.buildpath
.project
.settings
-=======
-.buildpath
-.project
-.settings/
->>>>>>> 0ebab42cc9ae615ca6c5ff7231613252771f7596
View
37 README.md
@@ -15,17 +15,34 @@ Coming soon...
## Installation for Developers
1. [Fork the project on github](http://help.github.com/forking/)
2. Clone your fork to a folder on your local machine:
- git clone git://github.com/tangentlabs/symfony-sandbox.git
-3. Initialise and update XwcCoreBundle submodule
- git submodule init
- git submodule update
-4. Set permissions
- chmod 777 app/cache -R
- chmod 777 app/logs -R
-5. Point your apache to the sandbox folder. You may simply symlink it in
-/var/www/ folder.
+
+ cd /path/to/workspace
+ git clone --recursive git://github.com/tangentlabs/symfony-sandbox.git
+ Note that the `--recursive` option will initialise any submodules
+3. Change ownership of cache and log folders so Apache can write:
+
+ sudo chown -R www-data:www-data app/cache app/logs
+4. Point your apache to the sandbox folder. You may simply symlink it in
+`/var/www/` folder.
+
sudo ln -s /path/to/xwc-sandbox /var/www/xwc-sandbox
-6. Go to "http://WEBSERVER/xwc-sandbox/web/app_dev.php/
+5. Open in browser
+
+ x-www-browser http://localhost/xwc-sandbox/web/app_dev.php/
+ You should see a success screen
+
+### Trouble-shooting
+
+* Note that you need to install the `php-sqlite3` package:
+
+ sudo apt-get install php5-sqlite
+ sudo apache2ctl restart
+
+* You may need to run a `git pull` within the submodule to grab the latest version:
+
+ cd src/Tangent/XwcBundle/
+ git pull origin master
+
### Updating your fork with latest changes in xwc-sandbox
1. In project folder run:
View
2 web/app_dev.php
@@ -2,7 +2,7 @@
// this check prevents access to debug front controllers that are deployed by accident to production servers.
// feel free to remove this, extend it, or make something more sophisticated.
-if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) {
+if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '127.0.1.1', '::1'))) {
die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
}

0 comments on commit 5c3ed4f

Please sign in to comment.