]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
build/ops: Lock ceph user during a purge
authorCaleb Boylan <calebboylan@gmail.com>
Tue, 16 May 2017 17:40:10 +0000 (10:40 -0700)
committerCaleb Boylan <calebboylan@gmail.com>
Fri, 23 Jun 2017 22:44:16 +0000 (15:44 -0700)
Signed-off-by: Caleb Boylan <calebboylan@gmail.com>
debian/ceph-common.postinst
debian/ceph-common.postrm

index 719dc7908b95ffaa241e62ed803802fd7b216500..b9d382aaaa91465b77ed5a54b189d8cd18b00ac5 100644 (file)
@@ -62,6 +62,12 @@ case "$1" in
                -d $SERVER_HOME   \
                -g $SERVER_GROUP  \
                $SERVER_USER
+       # Unlock $SERVER_USER in case it is locked from an uninstall
+       if [ -f /etc/shadow ]; then
+           usermod -U -e '' $SERVER_USER
+       else
+           usermod -U $SERVER_USER
+       fi
        echo "..done"
 
        # 5. adjust file and directory permissions
index b62185483cb6ea1f2a5f5462316f4ea3b8bdc852..e6a97543ac161646d3c78311c21b52d706719509 100644 (file)
@@ -24,8 +24,17 @@ case "$1" in
     ;;
 
     purge)
-       rm -rf /var/log/ceph 
-       rm -rf /etc/ceph
+        [ -f "/etc/default/ceph" ] && . /etc/default/ceph
+        [ -z "$SERVER_USER" ] && SERVER_USER=ceph
+
+        rm -rf /var/log/ceph
+        rm -rf /etc/ceph
+
+        if [ -f /etc/shadow ]; then
+            usermod -L -e 1 $SERVER_USER
+        else
+            usermod -L $SERVER_USER
+        fi
     ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)