aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolan McMahon <caolan.mcmahon@gmail.com>2019-09-14 14:22:44 +0100
committerCaolan McMahon <caolan.mcmahon@gmail.com>2019-09-14 14:22:44 +0100
commit9cef76ed401c12d9bd9c927fc36af28091b2033a (patch)
tree147dc7df65cbbabfd3ef6b71da771f4cb196beea
parentb41ecced79ba524d37b1db3767faab9fee4131c9 (diff)
downloaddarkpeak-services-9cef76ed401c12d9bd9c927fc36af28091b2033a.tar.gz
darkpeak-services-9cef76ed401c12d9bd9c927fc36af28091b2033a.tar.xz
darkpeak-services-9cef76ed401c12d9bd9c927fc36af28091b2033a.zip
Upgrade to Debian 10 "Buster"
-rw-r--r--README.md4
-rw-r--r--UPGRADE.md20
-rw-r--r--Vagrantfile5
m---------roles/community/geerlingguy.mysql0
m---------roles/community/geerlingguy.postgresql0
-rw-r--r--roles/mediawiki/templates/LocalSettings.php.j23
-rw-r--r--roles/sabredav/tasks/main.yml2
-rw-r--r--roles/tls/tasks/main.yml7
-rw-r--r--roles/ttrss/tasks/main.yml4
-rw-r--r--roles/znc/tasks/main.yml7
10 files changed, 29 insertions, 23 deletions
diff --git a/README.md b/README.md
index 9eabdf6..dd98b51 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ For those that are unable to use Virtual Box due to it requiring you to disable
Create and install a Debian VM using libvirt (at least 1Gb memory is needed):
virt-install --connect=qemu:///system --name darkpeak --arch x86_64 --vcpus 2 --memory 4096 --disk size=20 \
- --location http://ftp.us.debian.org/debian/dists/stretch/main/installer-amd64/
+ --location http://ftp.us.debian.org/debian/dists/buster/main/installer-amd64/
Copy your SSH public key into the machine:
@@ -91,7 +91,7 @@ In order to test, you will need to add hostnames to your hosts file. The TLD has
This ansible file will disable password-based authentication, so make
sure you add your SSH public keys to /root/.ssh/authorized_keys before
-doing the first deployment.
+doing the first deployment.
After the first deployment you must make sure that you set `first_run`
to `false` in `prod-playbook.yml`.
diff --git a/UPGRADE.md b/UPGRADE.md
new file mode 100644
index 0000000..99f9b13
--- /dev/null
+++ b/UPGRADE.md
@@ -0,0 +1,20 @@
+# Debian Stretch to Buster
+
+* Remove stretch-backports from apt sources
+ * This was previously used to install the following packages now
+ available in the base buster release:
+ * znc (1.7.2-3)
+ * certbot
+* Follow instructions at https://www.debian.org/releases/buster/amd64/release-notes/ch-upgrading.en.html
+ * sudo apt-get update
+ * sudo apt-get upgrade
+ * sudo dpkg --audit (check for any packages in an failed/error state)
+ * sudo dpkg --get-selections | grep 'hold$' (look for any packages with a version hold)
+ * replace references to 'stretch' with 'buster' in /etc/apt/sources.list and /etc/apt/sources.list.d/*
+ * script -t 2>~/upgrade-buster1.time -a ~/upgrade-buster1.script (keep record of upgrade process)
+ * sudo apt update
+ * sudo apt -o APT::Get::Trivial-Only=true full-upgrade (check enough disk space is available for upgrade)
+ * sudo apt-get upgrade
+ * sudo apt full-upgrade
+ * run ansible provisioning again
+ * reboot machine
diff --git a/Vagrantfile b/Vagrantfile
index d860574..b6b71c9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,7 @@
Vagrant.configure("2") do |config|
- config.vm.box = "debian/stretch64"
+ config.vm.box = "debian/buster64"
# disable synced /vagrant folder
config.vm.synced_folder '.', '/vagrant', disabled: true
@@ -14,7 +14,7 @@ Vagrant.configure("2") do |config|
config.vm.provider "libvirt" do |libvirt|
libvirt.memory = 1024
end
-
+
config.vm.provider "virtualbox" do |virtualbox|
virtualbox.memory = 1024
end
@@ -26,4 +26,3 @@ Vagrant.configure("2") do |config|
config.vm.network "private_network", ip: "192.168.33.10"
end
-
diff --git a/roles/community/geerlingguy.mysql b/roles/community/geerlingguy.mysql
-Subproject 29ae036af1168a53f00b821ff8a3933af90496c
+Subproject 88313b088b8c196e07ef0c88bc36b6b0accfe3e
diff --git a/roles/community/geerlingguy.postgresql b/roles/community/geerlingguy.postgresql
-Subproject 66e8af0adf8d0e56d55d14f3da99a5347f9f433
+Subproject a8b2eb0b644ef9ce5d53032b706a61ad85f2020
diff --git a/roles/mediawiki/templates/LocalSettings.php.j2 b/roles/mediawiki/templates/LocalSettings.php.j2
index 3e1a89c..1b066ac 100644
--- a/roles/mediawiki/templates/LocalSettings.php.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.j2
@@ -104,8 +104,6 @@ $wgDefaultSkin = "vector";
# Enabled skins.
# The following skins were automatically enabled:
-wfLoadSkin( 'CologneBlue' );
-wfLoadSkin( 'Modern' );
wfLoadSkin( 'MonoBook' );
wfLoadSkin( 'Vector' );
@@ -200,4 +198,3 @@ function darkpeakLoginLink( &$personal_urls, $title ) {
## https://www.mediawiki.org/wiki/Manual:Short_URL
$wgArticlePath = "/wiki/$1";
-
diff --git a/roles/sabredav/tasks/main.yml b/roles/sabredav/tasks/main.yml
index 52a4a77..689f435 100644
--- a/roles/sabredav/tasks/main.yml
+++ b/roles/sabredav/tasks/main.yml
@@ -43,7 +43,7 @@
name: "{{ item }}"
with_items:
- php7.0
- - php-dom
+ - php7.0-xml
- php-mbstring
- php-mysql
- php-ldap
diff --git a/roles/tls/tasks/main.yml b/roles/tls/tasks/main.yml
index 1f41c6f..4fc601f 100644
--- a/roles/tls/tasks/main.yml
+++ b/roles/tls/tasks/main.yml
@@ -1,7 +1,3 @@
-- name: Add stretch-backports
- apt_repository:
- repo: "deb http://deb.debian.org/debian stretch-backports main"
-
- name: Install ssl-cert package
apt:
name: ssl-cert
@@ -9,10 +5,9 @@
update_cache: yes
cache_valid_time: 10800 # 3 hours
-- name: Install certbot package from backports
+- name: Install certbot package
apt:
name: certbot
- default_release: stretch-backports
state: present
update_cache: yes
cache_valid_time: 10800 # 3 hours
diff --git a/roles/ttrss/tasks/main.yml b/roles/ttrss/tasks/main.yml
index 42d13b7..e016856 100644
--- a/roles/ttrss/tasks/main.yml
+++ b/roles/ttrss/tasks/main.yml
@@ -21,7 +21,7 @@
cache_valid_time: 10800 # 3 hours
with_items:
- git # For cloning ttrss souece
- - php7.0-curl
+ - php-curl
- php7.0-mbstring
- php7.0-pgsql
- php7.0-xml
@@ -75,7 +75,7 @@
dest: "{{ web_root }}/plugins/"
owner: ttrss
group: ttrss
-
+
- name: Install systemd unit file for update daemon
template:
src: ttrss_backend.service.j2
diff --git a/roles/znc/tasks/main.yml b/roles/znc/tasks/main.yml
index 83e1ad9..3371293 100644
--- a/roles/znc/tasks/main.yml
+++ b/roles/znc/tasks/main.yml
@@ -1,11 +1,6 @@
-- name: Add stretch-backports
- apt_repository:
- repo: "deb http://deb.debian.org/debian stretch-backports main"
-
-- name: Install ZNC and dependencies from backports
+- name: Install ZNC and dependencies
apt:
name: "{{ item }}"
- default_release: stretch-backports
state: present
update_cache: yes
cache_valid_time: 10800 # 3 hours