Generate /etc/default/gerritcodereview after install
Change-Id: I93ac33927e064aeb1492f364c703851b56a32059
diff --git a/fpm/Makefile b/fpm/Makefile
index f196668..947a256 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -20,7 +20,7 @@
RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb
-CONFIGS=$(wildcard etc/*) etc/gerritcodereview
+CONFIGS=$(wildcard etc/*)
SCRIPTS=$(foreach script,$(wildcard scripts/*),$(notdir $(script)))
BUILD_SCRIPTS=$(foreach script,$(SCRIPTS),$(SCRIPTS_ROOT)/$(script))
@@ -51,12 +51,12 @@
mkdir -p $(BUILD_ROOT)/bin
cp $(CONFIGS) $(BUILD_ROOT)/etc
-groupadd $(GROUP)
- -useradd $(USER)
+ $(eval GROUP_ID := $(shell /usr/bin/getent group $(GROUP) | cut -d ':' -f 3))
+ -useradd -g $(GROUP_ID) $(USER)
clobber: clean
rm -Rf $(BUILD_ROOT)
rm -Rf $(SCRIPTS_ROOT)
- rm -Rf etc/gerritcodereview
$(WAR): $(basedir $(WAR))
curl -o $@ $(URL)
@@ -68,9 +68,6 @@
echo "GERRIT_SITE=$(GERRIT_SITE)" >> $@
cat $< >> $@
-etc/gerritcodereview:
- echo "GERRIT_SITE=$(GERRIT_SITE)" > $@
-
$(RPM_OUT): $(WAR) $(CONFIGS) $(BUILD_SCRIPTS) chown
fpm -t rpm -p $@ $(RPM_OPTS)
diff --git a/fpm/scripts/after-install.sh b/fpm/scripts/after-install.sh
index 641fe45..0fcfabf 100755
--- a/fpm/scripts/after-install.sh
+++ b/fpm/scripts/after-install.sh
@@ -1,5 +1,9 @@
SUDO="sudo -u $USER"
LOG=/tmp/gerrit-installer.log
+chmod a+rw $LOG
+
+[ ! -d /etc/default ] && mkdir -p /etc/default
+echo "GERRIT_SITE=$GERRIT_SITE" > /etc/default/gerritcodereview
echo ""
echo -n "Initialising Gerrit site ... "
@@ -19,8 +23,6 @@
cd /etc/init.d && ln -sf $GERRIT_SITE/bin/gerrit.sh gerrit
cd /var/log && ln -sf $GERRIT_SITE/logs gerrit
cd /etc && ln -sf $GERRIT_SITE/etc gerrit
-[ ! -d /etc/default ] && mkdir -p /etc/default
-cd /etc/default && ln -sf /etc/gerrit/gerritcodereview
echo "DONE"
echo ""
diff --git a/fpm/scripts/before-install.sh b/fpm/scripts/before-install.sh
index c268428..89d3c70 100755
--- a/fpm/scripts/before-install.sh
+++ b/fpm/scripts/before-install.sh
@@ -1,9 +1,10 @@
LOG=/tmp/gerrit-installer.log
+chmod a+rw $LOG
GROUP_ID=$(/usr/bin/getent group $GROUP | cut -d ':' -f 3 2>> $LOG || true)
if [ "$GROUP_ID" == "" ]
then
- echo -n "Creating $GROUP group ... "
+ echo -n "Creating $GROUP group ... "
groupadd $GROUP >> $LOG 2>> $LOG
[ $? != 0 ] && echo "FAILED" && exit 1
GROUP_ID=$(/usr/bin/getent group $GROUP | cut -d ':' -f 3 2>> $LOG || true)
@@ -13,7 +14,7 @@
USER_PASSWD=$(/usr/bin/getent passwd $USER 2>> $LOG || true)
if [ "$USER_PASSWD" == "" ]
then
- echo -n "Creating $USER user ... "
+ echo -n "Creating $USER user ... "
useradd $USER -M -g $GROUP_ID -d $GERRIT_SITE >> $LOG 2>> $LOG
[ $? != 0 ] && echo "FAILED" && exit 1
echo "DONE"
