Browse Source

Create and remove search engine users

Bob Mottram 9 years ago
parent
commit
45e48526dc
3 changed files with 13 additions and 1 deletions
  1. 1
    1
      src/freedombone
  2. 6
    0
      src/freedombone-adduser
  3. 6
    0
      src/freedombone-rmuser

+ 1
- 1
src/freedombone View File

9364
                 SEARCH_ENGINE_PASSWORD="$(openssl rand -base64 16)"
9364
                 SEARCH_ENGINE_PASSWORD="$(openssl rand -base64 16)"
9365
             fi
9365
             fi
9366
         fi
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
         echo '' >> /home/$MY_USERNAME/README
9368
         echo '' >> /home/$MY_USERNAME/README
9369
         echo '' >> /home/$MY_USERNAME/README
9369
         echo '' >> /home/$MY_USERNAME/README
9370
         echo $'Search Engine' >> /home/$MY_USERNAME/README
9370
         echo $'Search Engine' >> /home/$MY_USERNAME/README

+ 6
- 0
src/freedombone-adduser View File

365
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.irssi
365
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.irssi
366
 fi
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
 # add user menu on ssh login
374
 # add user menu on ssh login
369
 if ! grep -q 'control' /home/$MY_USERNAME/.bashrc; then
375
 if ! grep -q 'control' /home/$MY_USERNAME/.bashrc; then
370
     echo 'control' >> /home/$MY_USERNAME/.bashrc
376
     echo 'control' >> /home/$MY_USERNAME/.bashrc

+ 6
- 0
src/freedombone-rmuser View File

104
     fi
104
     fi
105
 fi
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
 #if grep -q "install_owncloud" $COMPLETION_FILE; then
113
 #if grep -q "install_owncloud" $COMPLETION_FILE; then
108
 #    occ user:delete $MY_USERNAME
114
 #    occ user:delete $MY_USERNAME
109
 #fi
115
 #fi