From 42edad1e8c29fd79fce6b1957015dfe31e5b6f2d Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 28 Aug 2019 16:53:24 +0200 Subject: [PATCH] Tweaks to the ubuntu installation instructions (#2688) * Tweaks to the ubuntu installation instructions I recently walked a new user through the Ubuntu installation, and noticed some things that were confusing to him that would be easy to fix. * Use release names as well as numbers --- README.md | 2 +- docs/installationguide/ubuntu.rst | 30 +++++++----------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index b0f4be37b..2939aa941 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Better methods exist today that do much of this for you. The current development This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros: -- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor/+archive/ubuntu/zoneminder) +- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor) - Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) - RHEL/CentOS and clones via [RPM Fusion](http://rpmfusion.org) - Fedora via [RPM Fusion](http://rpmfusion.org) diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst index 582b8e5c5..65b6d163e 100644 --- a/docs/installationguide/ubuntu.rst +++ b/docs/installationguide/ubuntu.rst @@ -3,8 +3,8 @@ Ubuntu .. contents:: -Easy Way: Ubuntu 18.04 ----------------------- +Easy Way: Ubuntu 18.04 (Bionic) +------------------------------- These instructions are for a brand new ubuntu 18.04 system which does not have ZM installed. @@ -15,6 +15,7 @@ achieve the same result by running: :: + sudo apt-get install tasksel sudo tasksel install lamp-server During installation it will ask you to set up a master/root password for the MySQL. @@ -39,19 +40,10 @@ guide you with a quick search. following a new release of ZoneMinder. To use this repository instead of the official Ubuntu repository, enter the following from the command line: - :: - - add-apt-repository ppa:iconnor/zoneminder - - Please note that as of 1.32.0 We are creating a new PPA for each major version, as a means to prevent automatic upgrades from one major version to another. So instead of the above ppa line use the following: - :: add-apt-repository ppa:iconnor/zoneminder-1.32 - If you are on Trusty or Xenial, you may want to add both, as there are some packages for dependencies included in the old ppa. - - Update repo and upgrade. :: @@ -202,8 +194,8 @@ CTRL+x to exit PPA install may need some tweaking of ZMS_PATH in ZoneMinder options. `Socket_sendto or no live streaming`_ -Easy Way: Ubuntu 16.04 ----------------------- +Easy Way: Ubuntu 16.04 (Xenial) +------------------------------- These instructions are for a brand new ubuntu 16.04 system which does not have ZM installed. @@ -241,16 +233,8 @@ guide you with a quick search. :: add-apt-repository ppa:iconnor/zoneminder - - Please note that as of 1.32.0 We are creating a new PPA for each major version, as a means to prevent automatic upgrades from one major version to another. So instead of the above ppa line use the following: - - :: - add-apt-repository ppa:iconnor/zoneminder-1.32 - If you are on Trusty or Xenial, you may want to add both, as there are some packages for dependencies included in the old ppa. - - Update repo and upgrade. :: @@ -401,8 +385,8 @@ CTRL+x to exit PPA install may need some tweaking of ZMS_PATH in ZoneMinder options. `Socket_sendto or no live streaming`_ -Easy Way: Ubuntu 14.x ---------------------- +Easy Way: Ubuntu 14.x (Trusty) +------------------------------ **These instructions are for a brand new ubuntu 14.x system which does not have ZM installed.** **Step 1:** Either run commands in this install using sudo or use the below to become root