From 40429b279b915b5a4347a4c0aca144e91f9968a5 Mon Sep 17 00:00:00 2001
From: Nils Christian <nils.christian@ittm-solutions.com>
Date: Thu, 9 Nov 2017 17:02:43 +0100
Subject: [PATCH] removed Oracle Java from installation instructions (openjdk
 works fine)

---
 rpm/INSTALL.rst | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/rpm/INSTALL.rst b/rpm/INSTALL.rst
index ec7de36f71..11116e0551 100644
--- a/rpm/INSTALL.rst
+++ b/rpm/INSTALL.rst
@@ -19,41 +19,12 @@ Overview
 
 The main steps are
 
-* Install `Oracle Java SE Development Kit 8 <http://www.oracle.com/technetwork/java/javase/downloads/index.html>`_.
 * Install `PostgreSQL <https://www.postgresql.org/>`_ and set up a
   database.
 * Install and configure `Apache Tomcat <https://tomcat.apache.org/>`_.
 * Install the MINERVA RPM.
 
 
-Java SE Development Kit
------------------------
-
-Red Hat Enterprise Linux 7
-``````````````````````````
-
-Follow the instructions at https://access.redhat.com/solutions/732883
-to install ``java-1.8.0-oracle``.
-
-CentOS 7
-````````
-
-Follow the link for ``Java SE Development Kit 8`` at
-`<http://www.oracle.com/technetwork/java/javase/downloads/index.html>`_,
-download the latest RPM and install it with
-
-.. code:: shell
-
-    yum install -y jdk-8uXXX-linux-x64.rpm
-
-
-.. warning::
-
-    This way of installing Java does **not** ensure that security
-    updates are installed with ``yum update``, therefore you have to
-    establish a process to install such updates manually.
-
-
 PostgreSQL
 ----------
 
@@ -116,7 +87,7 @@ connections, e.g. using ``firewalld`` this can be accomplished with
 
 .. code:: shell
 
-    firewall-cmd --zone=public --add-port=8080/tcp
+    firewall-cmd --permanent --zone=public --add-port=8080/tcp
 
 .. warning::
 
-- 
GitLab