From 139511c3fe46ad26e9cc938e0dabfab0b346823a Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Sat, 30 May 2020 12:28:50 +0200
Subject: [PATCH 1/2] branch needs export

---
 README.md        | 2 +-
 vm/LXC_README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e27645c9..044a3cb8 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 cd /root
 curl -sL https://pan.do/ra-install > pandora_install.sh
 chmod +x pandora_install.sh
-BRANCH=stable # change to 'master' to get current developement version
+export BRANCH=stable # change to 'master' to get current developement version
 ./pandora_install.sh 2>&1 | tee pandora_install.log
 ```
 
diff --git a/vm/LXC_README.md b/vm/LXC_README.md
index 8f91e41e..440d412a 100644
--- a/vm/LXC_README.md
+++ b/vm/LXC_README.md
@@ -41,6 +41,6 @@
     cd /root
     curl -sL https://pan.do/ra-install > pandora_install.sh
     chmod +x pandora_install.sh
-    BRANCH=stable # or master
+    export BRANCH=stable # or master
     ./pandora_install.sh 2>&1 | tee pandora_install.log
 

From e99d59c0df97df453e849dea67c9ae9155d8dbfd Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Sat, 30 May 2020 12:37:08 +0200
Subject: [PATCH 2/2] install fixes

---
 pandora/system/migrations/0003_field_length.py | 10 ++++++++++
 update.py                                      |  2 +-
 vm/pandora_install.sh                          |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pandora/system/migrations/0003_field_length.py b/pandora/system/migrations/0003_field_length.py
index 2381ebe7..a499f65c 100644
--- a/pandora/system/migrations/0003_field_length.py
+++ b/pandora/system/migrations/0003_field_length.py
@@ -11,6 +11,16 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='password',
+            field=models.CharField(max_length=255, verbose_name='password'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            fields=models.CharField(blank=True, max_length=30, verbose_name='last name'),
+        ),
         migrations.AlterField(
             model_name='user',
             name='email',
diff --git a/update.py b/update.py
index 669f0981..2c1de756 100755
--- a/update.py
+++ b/update.py
@@ -304,7 +304,7 @@ if __name__ == "__main__":
             development = branch == 'master'
         elif len(sys.argv) == 3 and sys.argv[1] == 'switch':
             branch = sys.argv[2]
-            development = False
+            development = branch == 'master'
         else:
             branch = 'master'
             development = True
diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh
index 2d898c98..65d776c2 100755
--- a/vm/pandora_install.sh
+++ b/vm/pandora_install.sh
@@ -197,7 +197,7 @@ fi
 if [ "$NGINX" == "local" ]; then
 
 cp "/srv/pandora/etc/nginx/pandora" "/etc/nginx/sites-available/pandora"
-rm /etc/nginx/sites-enabled/default
+rm -f /etc/nginx/sites-enabled/default
 ln -s ../sites-available/pandora /etc/nginx/sites-enabled/pandora
 
 read -r -d '' GZIP <<EOI