From f3c08436b10eceb5585f17f9a5383542eb061a78 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Fri, 23 Mar 2012 21:57:43 +0100
Subject: [PATCH] install generic kernel in vm, that way it can boot of sata
 controller in virtualbox

---
 README          | 43 ++++++++++++++++++++++---------------------
 vm/README.txt   | 12 ++++++------
 vm/build.sh     |  1 +
 vm/firstboot.sh | 12 +++++-------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README b/README
index 2cd6efee..e4cc134e 100644
--- a/README
+++ b/README
@@ -13,7 +13,8 @@ python, bazaar, pip and virtualenv and several other python modules:
             python-setuptools python-pip python-virtualenv ipython \
             python-dev python-imaging python-numpy python-psycopg2 \
             python-geoip python-html5lib python-lxml \
-            postgresql rabbitmq-server
+            postgresql postgresql-contrib rabbitmq-server
+
     apt-get install oxframe oxtimeline 
 
 * Pan.do/ra
@@ -27,7 +28,10 @@ Get code from bazzar
     bzr branch http://code.0x2620.org/oxjs
 
 create settings_local.py and create site.jsonc
-(use settings.py / 0xdb.jsonc / padma.jsonc as example)
+do noy copy settings.py but only overwrite your changes in settings_local.py
+(check https://wiki.0x2620.org/wiki/pandora/configuration
+ and use settings.py / 0xdb.jsonc / padma.jsonc as example)
+
 create db
     
     ./manage.py syncdb
@@ -37,7 +41,6 @@ create / update static files
     ./manage.py update_static 
     ./manage.py compile_pyc
 
-
 * Database
   We use postgresql but other databases might also work
   (make sure you have the python bindings installed).
@@ -64,24 +67,7 @@ create / update static files
     install qt-faststart from (ffmpeg/tools)
     to enable add "mp4" to video.formats in your config.jsonc
 
-Running developer environment:
-  in one terminal:
-    ./manage.py runserver
-  and in another one:
-    ./manage.py celeryd -Q default,encoding -B
-
-=== Updating ===
-To update a pandora installation get the latest version from bzr by running
-    ./update.sh
-this will pull pandora/oxjs/python-ox and list possible upgrades to the db
-
-to update your database tables, use
-   ./manage.py sqldiff -a
-to check if there are changes and
-   ./manage.py sqldiff -a | ./manage.py dbshell
-to apply them.
-
-== DEPLOYMENT ==
+== Deployment ==
 * Install upstart scripts
 check etc/init for upstart scripts, adjust path and user and put into /etc/init
 
@@ -103,3 +89,18 @@ To run pan.do/ra in production, we use nginx, using apache2 is also possible.
 
   setup apache according to etc/apache2/vhost.in
 
+=== Updating ===
+To update a pandora installation get the latest version from bzr by running
+    ./update.sh
+
+this will update pandora/oxjs/python-ox and list possible upgrades to the db
+
+to update your database tables, use
+   ./manage.py sqldiff -a
+to check if there are changes and
+   ./manage.py sqldiff -a | ./manage.py dbshell
+to apply them.
+
+=== Development ===
+  in one terminal:
+    ./manage.py runserver
diff --git a/vm/README.txt b/vm/README.txt
index ec7fb868..a78f229c 100644
--- a/vm/README.txt
+++ b/vm/README.txt
@@ -19,17 +19,17 @@ with that installed build image:
 this will create a vdi image in pandora/
 
 == VirtualBox Usage ==
-Now you can create a new VirtualBox machine, use vdi image as existing hard disk.
-Before starting up you have to adjust some settings:
- In System -> Processor enable PAE/NX
- In Storage remove disk from SATA Controller
-            add disk to IDE Controler and enable "Use host I/O cache"
-    
+Now you can create a new VirtualBox machine,
+select Linux/Ubuntu and use vdi image as existing hard disk.
+
+Before starting up:
  In Network -> Adpater 1 set to Bridged Adapter with your connected controller
 
 == Use for development ==
 Login via ssh or in terminal as pandora with password pandora
 
+  ssh pandora@pandora.local
+
 Adjust your bzr configuration with bzr whoami:
  bzr whoami "Pando the Panda <pan.do@pan.do>"
 
diff --git a/vm/build.sh b/vm/build.sh
index 8699fe45..b6771bc8 100755
--- a/vm/build.sh
+++ b/vm/build.sh
@@ -3,6 +3,7 @@ base=$(pwd)
 sudo  vmbuilder vbox ubuntu --suite=oneiric \
     --verbose --debug \
     --arch i386 \
+    --flavour generic \
     --dest $base/pandora \
     --hostname pandora \
     --swapsize 512 \
diff --git a/vm/firstboot.sh b/vm/firstboot.sh
index c92d7573..0bbb0adb 100755
--- a/vm/firstboot.sh
+++ b/vm/firstboot.sh
@@ -10,7 +10,7 @@ wget http://firefogg.org/nightly/ffmpeg2theora.linux -O /usr/local/bin/ffmpeg2th
 chmod 755 /usr/local/bin/ffmpeg2theora
 
 #postgresql
-apt-get -y install postgresql
+apt-get -y install postgresql postgresql-contrib
 sudo -u postgres createuser -S -D -R pandora
 sudo -u postgres createdb  -T template0 --locale=C --encoding=UTF8 -O pandora pandora
 
@@ -21,6 +21,9 @@ rabbitmqctl add_vhost /pandora
 rabbitmqctl set_permissions -p /pandora pandora ".*" ".*" ".*"
 
 #pandora
+HOST=$(hostname -s)
+SITE_CONFIG="/srv/pandora/pandora/$HOST.jsonc"
+test -e $SITE_CONFIG || cp /srv/pandora/pandora/0xdb.jsonc $SITE_CONFIG
 cat > /srv/pandora/pandora/local_settings.py << EOF
 DATABASES = {
     'default': {
@@ -30,20 +33,15 @@ DATABASES = {
         'PASSWORD': '',
     }
 }
-
 DEBUG = False
-
 DATA_SERVICE = ""
-SITE_CONFIG = '/srv/pandora/pandora/pandora.jsonc'
-
+SITE_CONFIG = '$SITE_CONFIG'
 BROKER_PASSWORD = "$RABBITPWD"
-
 XACCELREDIRECT = True
 EOF
 
 cd /srv/pandora/pandora
 sudo -u pandora python manage.py syncdb --noinput
-HOST=$(hostname -s)
 echo "UPDATE django_site SET domain = '$HOST.local', name = '$HOST.local' WHERE 1=1;" | sudo -u pandora python manage.py dbshell