[Kimchi-devel] [PATCH v4 3/3] Github #329: .gitignore, spec, control.in and readme

[Daniel Barboza]

From: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>

Added src/nginx.conf.in to Fedora and SUSE spec files and nginx
as dependency.
Added src/nginx.conf.in to Makefile.am.
Added nginx to contrib/DEBIAN/control.in as a dependency.
Added nginx to README.md instructions.
Added src/nginx_kimchi.conf to .gitignore. This file is a product
of the nginx.config.in template tha was used for the last (or
current) kimchid/nginx run. As such, there is no need to put
this file in version control.

Signed-off-by: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>
---
 .gitignore                    | 1 +
 contrib/DEBIAN/control.in     | 3 ++-
 contrib/kimchi.spec.fedora.in | 2 ++
 contrib/kimchi.spec.suse.in   | 2 ++
 docs/README.md                | 4 ++--
 src/Makefile.am               | 3 ++-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 073f46e..a776cb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ stamp-po
 kimchi-*.tar.gz
 src/kimchid
 src/kimchi.conf
+src/nginx_kimchi.conf
 src/kimchi/config.py
 tests/run_tests.sh
 tests/test_config.py
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index c2b2a40..aac1a24 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -22,7 +22,8 @@ Depends: python-cherrypy3 (>= 3.2.0),
          python-ipaddr,
          python-lxml,
          open-iscsi,
-         firewalld
+         firewalld,
+         nginx
 Build-Depends: libxslt,
                python-libxml2
 Maintainer: Aline Manera <alinefm at br.ibm.com>
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index 1cd99b0..77bf6bf 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -28,6 +28,7 @@ Requires:	sos
 Requires:	python-ipaddr
 Requires:	python-lxml
 Requires:	nfs-utils
+Requires:	nginx
 Requires:	iscsi-initiator-utils
 BuildRequires:	libxslt
 BuildRequires:	libxml2-python
@@ -175,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kimchi/ui/pages/help/*/*.html
 %{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
 %{_sysconfdir}/kimchi/kimchi.conf
+%{_sysconfdir}/kimchi/nginx.conf.in
 %{_sysconfdir}/kimchi/distros.d/debian.json
 %{_sysconfdir}/kimchi/distros.d/fedora.json
 %{_sysconfdir}/kimchi/distros.d/opensuse.json
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index efb2c08..89374e1 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -24,6 +24,7 @@ Requires:	python-ipaddr
 Requires:	python-lxml
 Requires:	python-xml
 Requires:	nfs-client
+Requires:	nginx
 Requires:	open-iscsi
 BuildRequires:	libxslt-tools
 BuildRequires:	python-libxml2
@@ -101,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kimchi/ui/pages/help/*/*.html
 %{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
 %{_sysconfdir}/kimchi/kimchi.conf
+%{_sysconfdir}/kimchi/nginx.conf.in
 %{_sysconfdir}/kimchi/distros.d/debian.json
 %{_sysconfdir}/kimchi/distros.d/fedora.json
 %{_sysconfdir}/kimchi/distros.d/opensuse.json
diff --git a/docs/README.md b/docs/README.md
index 8b8b181..63ac760 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -53,7 +53,7 @@ Install Dependencies
                         PyPAM m2crypto python-jsonschema rpm-build \
                         qemu-kvm python-psutil python-ethtool sos \
                         python-ipaddr python-lxml nfs-utils \
-                        iscsi-initiator-utils libxslt pyparted
+                        iscsi-initiator-utils libxslt pyparted nginx
      # If using RHEL6, install the following additional packages:
      $ sudo yum install python-unittest2 python-ordereddict
      # Restart libvirt to allow configuration changes to take effect
@@ -75,7 +75,7 @@ for more information on how to configure your system to access this repository.
                            python-pam python-m2crypto python-jsonschema \
                            qemu-kvm libtool python-psutil python-ethtool \
                            sosreport python-ipaddr python-lxml nfs-common \
-                           open-iscsi lvm2 xsltproc python-parted
+                           open-iscsi lvm2 xsltproc python-parted nginx
 
     Packages version requirement:
         python-jsonschema >= 1.3.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 2005f7c..dfeb24e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,13 +21,14 @@ SUBDIRS = kimchi distros.d
 
 EXTRA_DIST = kimchid.in \
 	kimchi.conf.in \
+	nginx.conf.in \
 	firewalld.xml \
 	$(NULL)
 
 bin_SCRIPTS = kimchid
 
 confdir = $(sysconfdir)/kimchi
-dist_conf_DATA = kimchi.conf
+dist_conf_DATA = kimchi.conf nginx.conf.in
 
 BUILT_SOURCES = kimchi.conf
 
-- 
1.8.3.1