From 7223f7c75a93a8ceb8799767d39010241ba54121 Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Mon, 10 Aug 2015 14:32:41 -0700
Subject: [PATCH] Packaging: fix rpm -e removing /etc/elasticsearch

When we fixed rpm creating the /etc/elasticsearch/scripts directory we
broke removing the rpm - it lef the /etc/elasticsearch directory behind.
This fixes that.
---
 distribution/rpm/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/distribution/rpm/pom.xml b/distribution/rpm/pom.xml
index f679ba615e9..8b9da21d8d3 100644
--- a/distribution/rpm/pom.xml
+++ b/distribution/rpm/pom.xml
@@ -141,6 +141,15 @@
                             </sources>
                         </mapping>
                         <!-- Add configuration files -->
+                        <mapping>
+                            <!-- Explicitly add conf.dir to the file list so
+                                 that it is removed when the package is removed.
+                                 This is required because the scripts
+                                 subdirectory is created outside of the mapping
+                                 that creates the conf.dir.-->
+                            <directory>${packaging.elasticsearch.conf.dir}</directory>
+                            <configuration>noreplace</configuration>
+                        </mapping>
                         <mapping>
                             <directory>${packaging.elasticsearch.conf.dir}/</directory>
                             <configuration>noreplace</configuration>