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 a9f444b1e70a76d50dd996829e9ea9cc2f778325..895252da81952ed61a1387405be89f7027b94f75 100644 (file)
--- 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 1d207b0036a7f8450508ac3bc10e79fb593e8511..11bfad316244735580dccc449badfa21b2a383b4 100644 (file)
--- 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,