From 42ac3a2e46555ed8a49ea0aa856f09f213d391f4 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 13 Aug 2019 13:01:54 +0000
Subject: [PATCH] Update page 'UpgradeTo16.04'

---
 Upgrade-to-Ubuntu-18.04.md | 55 --------------------------------------
 UpgradeTo16.04.md          | 20 +++++++-------
 2 files changed, 10 insertions(+), 65 deletions(-)
 delete mode 100644 Upgrade-to-Ubuntu-18.04.md

diff --git a/Upgrade-to-Ubuntu-18.04.md b/Upgrade-to-Ubuntu-18.04.md
deleted file mode 100644
index 526af61..0000000
--- a/Upgrade-to-Ubuntu-18.04.md
+++ /dev/null
@@ -1,55 +0,0 @@
-## Upgrade to Ubuntu 16.04
-
-notes on upgrading unbuntu from 16.04 to 18.04 for pan.do/ra
-
-    apt-get install ubuntu-release-upgrader-core
-    do-release-upgrade
-
-Questions:
-- Do you want to upgrade glibc now? YES
-- Restart services during package upgrades without asking? YES
-- Keep /etc/nginx/nginx.conf and /etc/nginx/sites-available/default
-- install the package maintainer's version /etc/postgresql-common/createcluster.conf
-
-restart
-
-Post Upgrade:
-
-Install systemd service files and remove upstart scripts:
-
-
-    rm /etc/init/pandora*
-    /srv/pandora/ctl install
-
-possibly adjust settings in /srv/pandora/pandora/gunicorn_config.py
-
-Stop all pan.do/ra processes (run as root):
-
-    /srv/pandora/ctl stop
-
-Enable pan.do/ra PPA again (run as root):
-
-    sed -i "s/^# deb/deb/g" /etc/apt/sources.list.d/j*.list
-    apt update; apt upgrade; apt autoremove; apt clean
-
-New version of Postgres requires database migration (run as root):
-
-    apt install postgresql-10 postgresql-contrib-10 postgresql-client-10
-
-    pg_dropcluster 10 main --stop
-    pg_upgradecluster 9.5 main
-    pg_dropcluster 9.5 main
-
-    apt remove postgresql-9.5 postgresql-contrib-9.5 postgresql-client-9.5
-    systemctl restart postgresql
-    
-
-Upgrade virtualenv (run this as "pandora" user):
-
-    cd /srv/pandora
-    rm -r bin lib share
-    ./ctl init
-
-Start pan.do/ra again (run as root):
-
-    /srv/pandora/ctl start
\ No newline at end of file
diff --git a/UpgradeTo16.04.md b/UpgradeTo16.04.md
index b6356e7..526af61 100644
--- a/UpgradeTo16.04.md
+++ b/UpgradeTo16.04.md
@@ -1,6 +1,6 @@
 ## Upgrade to Ubuntu 16.04
 
-notes on upgrading unbuntu from 14.04 to 16.04 for pan.do/ra
+notes on upgrading unbuntu from 16.04 to 18.04 for pan.do/ra
 
     apt-get install ubuntu-release-upgrader-core
     do-release-upgrade
@@ -34,21 +34,21 @@ Enable pan.do/ra PPA again (run as root):
 
 New version of Postgres requires database migration (run as root):
 
-    apt install postgresql-9.5 postgresql-contrib-9.5 postgresql-client-9.5
-    
-    pg_dropcluster 9.5 main --stop
-    pg_upgradecluster 9.3 main
-    pg_dropcluster 9.3 main
-    
-    apt remove postgresql-9.3 postgresql-contrib-9.3 postgresql-client-9.3
+    apt install postgresql-10 postgresql-contrib-10 postgresql-client-10
+
+    pg_dropcluster 10 main --stop
+    pg_upgradecluster 9.5 main
+    pg_dropcluster 9.5 main
+
+    apt remove postgresql-9.5 postgresql-contrib-9.5 postgresql-client-9.5
     systemctl restart postgresql
     
 
 Upgrade virtualenv (run this as "pandora" user):
 
     cd /srv/pandora
-    rm -r lib/python2.7/site-packages/pip-* bin/pip* bin/python*
-    virtualenv -p /usr/bin/python2 --system-site-packages .
+    rm -r bin lib share
+    ./ctl init
 
 Start pan.do/ra again (run as root):