浏览代码

Create and remove search engine users

Bob Mottram 9 年前
父节点
当前提交
45e48526dc
共有 3 个文件被更改,包括 13 次插入1 次删除
  1. 1
    1
      src/freedombone
  2. 6
    0
      src/freedombone-adduser
  3. 6
    0
      src/freedombone-rmuser

+ 1
- 1
src/freedombone 查看文件

@@ -9364,7 +9364,7 @@ function install_search_engine {
9364 9364
                 SEARCH_ENGINE_PASSWORD="$(openssl rand -base64 16)"
9365 9365
             fi
9366 9366
         fi
9367
-		echo "$SEARCH_ENGINE_PASSWORD" | htpasswd -i -d -c /etc/nginx/.htpasswd $MY_USERNAME
9367
+        echo "$SEARCH_ENGINE_PASSWORD" | htpasswd -i -s -c /etc/nginx/.htpasswd $MY_USERNAME
9368 9368
         echo '' >> /home/$MY_USERNAME/README
9369 9369
         echo '' >> /home/$MY_USERNAME/README
9370 9370
         echo $'Search Engine' >> /home/$MY_USERNAME/README

+ 6
- 0
src/freedombone-adduser 查看文件

@@ -365,6 +365,12 @@ if grep -q "install_irc_client" $COMPLETION_FILE; then
365 365
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.irssi
366 366
 fi
367 367
 
368
+if [ -f /etc/nginx/.htpasswd ]; then
369
+	if ! grep "${MY_USERNAME}:" /etc/nginx/.htpasswd; then
370
+		echo "$NEW_USER_PASSWORD" | htpasswd -i -s /etc/nginx/.htpasswd $MY_USERNAME
371
+	fi
372
+fi
373
+
368 374
 # add user menu on ssh login
369 375
 if ! grep -q 'control' /home/$MY_USERNAME/.bashrc; then
370 376
     echo 'control' >> /home/$MY_USERNAME/.bashrc

+ 6
- 0
src/freedombone-rmuser 查看文件

@@ -104,6 +104,12 @@ if grep -q "GNU Social domain" $COMPLETION_FILE; then
104 104
     fi
105 105
 fi
106 106
 
107
+if [ -f /etc/nginx/.htpasswd ]; then
108
+    if grep "${MY_USERNAME}:" /etc/nginx/.htpasswd; then
109
+        htpasswd -D /etc/nginx/.htpasswd $MY_USERNAME
110
+    fi
111
+fi
112
+
107 113
 #if grep -q "install_owncloud" $COMPLETION_FILE; then
108 114
 #    occ user:delete $MY_USERNAME
109 115
 #fi