From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 9 Feb 2016 21:28:47 +0000 (+0100)
Subject: rpm: drop user_rgw and group_rgw template variables
X-Git-Tag: v10.0.4~10^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5c09a3e4e483ff7e6f512358a3dab01d37104baf;p=ceph.git

rpm: drop user_rgw and group_rgw template variables

These were originally used to template RGW tmpfiles.d, which was eliminated
by 8e13d89f0f136f5be8ab869190062abfcca0e23d

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index a9f444b1e70a..895252da8195 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -617,13 +617,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 		--with-librocksdb-static=check \
 %if 0%{?rhel} || 0%{?fedora}
 		--with-systemd-libexec-dir=/usr/libexec/ceph \
-		--with-rgw-user=root \
-		--with-rgw-group=root \
 %endif
 %if 0%{?suse_version}
 		--with-systemd-libexec-dir=/usr/lib/ceph/ \
-		--with-rgw-user=wwwrun \
-		--with-rgw-group=www \
 %endif
 		--with-radosgw \
 		$CEPH_EXTRA_CONFIGURE_ARGS \
diff --git a/configure.ac b/configure.ac
index 1d207b0036a7..11bfad316244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1275,50 +1275,6 @@ AC_ARG_WITH(
     ]
 )
 
-
-dnl rgw-user
-AC_SUBST(user_rgw)
-AC_ARG_WITH(
-    rgw-user,
-    AS_HELP_STRING(
-        [--with-rgw-user=USER],
-        [systemd unit directory @<:@USER_RGW@:>@
-        Defaults to "www-data"]
-    ),
-    [
-        user_rgw="$withval"
-    ],
-    [
-        if test "x$USER_RGW" = "x"; then
-            user_rgw=www-data
-        else
-            user_rgw="$USER_RGW"
-        fi
-    ]
-)
-
-dnl rgw-group
-AC_SUBST(group_rgw)
-AC_ARG_WITH(
-    rgw-group,
-    AS_HELP_STRING(
-        [--with-rgw-group=GROUP],
-        [systemd unit directory @<:@GROUP_RGW@:>@
-        Defaults to "www-data"]
-    ),
-    [
-        group_rgw="$withval"
-    ],
-    [
-        if test "x$GROUP_RGW" = "x"; then
-            group_rgw=www-data
-        else
-            group_rgw="$GROUP_RGW"
-        fi
-    ]
-)
-
-
 AC_SUBST(systemd_unit_dir)
 AC_ARG_WITH(
     systemd-unit-dir,