diff --git a/README.md b/README.md index a7a770a..f395730 100644 --- a/README.md +++ b/README.md @@ -8,37 +8,6 @@ Nlvmi is written to be lightweight, functional and easy to understand and modify Nlvmi supports multiple users (admins and restricted) on the frontend and also uses these users to run the VMs. No PAM, just su.
Unix users have /bin/false as shell and the password is stored within the nlvmi database.
-**Deps:**
-bash
-bridge-utils
-nginx / apache / lighttpd
-openssh
-php
-socat
-sqlite3 / mariadb (only sqlite3 for now)
-usermode-utilities
-openssl (for managing remote servers)
+Please consult the [wiki](https://git.nativenet.ch/nativenet.ch/nlvmi/wiki) pages for more information. -**Manual install:**
-become root
-cd /usr/local
-git clone https://git.nativenet.ch/nativenet.ch/nlvmi.git
-useradd nlvmi
-ln -sf ${PWD}/nlvmi/nlvmi /usr/bin/
-ln -sf ${PWD}/nlvmi/wrap-nlvmi /usr/bin/
-ln -sf ${PWD}/nlvmi/web /var/www/localhost/htdocs/nlvmi --or wherever your webroot is
-chown root:nlvmi nlvmi/*nlvmi
-chmod +s nlvmi/wrap-nlvmi
-mkdir /etc/nlvmi
-cp nlvmi/vlvmi.conf /etc/nlvmi/
--- if it is the masterserver, create the db - nlvmi createdb
-chown nobody:root /etc/nlvmi
- -After that, you should be able to access /nlvmi with a webbrowser. -Create a new user (user will be admin) and add a server. For localhost, the connectstring should stay empty. - -Do not forget to load the tun and tap kernel modules. - -#not yet implemented...
-mkdir /etc/nginx/nlvmi
-add an "include nlvmi/*.conf" statement within nginx.conf's server declaration.
+![nlvmi screenshot](https://madathome.nativenet.ch/nlvmi_screenshot.png) diff --git a/nlvmi.conf b/nlvmi.conf index f72b755..a6da088 100644 --- a/nlvmi.conf +++ b/nlvmi.conf @@ -7,12 +7,6 @@ #Loglovel 1-3, 3 is debug LOGLEVEL="3" -#Where your images are stored like qcow2 -VMDIRECTORY="/kvm|/dev/vg0" - -#Where your iso images are stored -ISODIRECTORY="/kvm/iso" - #Where pids and monitor sockets are getting stored RUNDIRECTORY="/run/nlvmi" @@ -22,16 +16,14 @@ DATABASETYPE="sqlite" #only sqlite settings SQLITEFILE="/etc/nlvmi/nlvmi.sqlite" -#The unix user that runs php, to grand permissions on the sqlite file +#The unix user that runs php, to grant permissions on the sqlite file PHPUSER="nobody" #Masterserver only used for remote connections -MASTERSERVER="192.168.0.3" +#MASTERSERVER="192.168.0.3" - -#only mariadb settings -MARIAHOST="localhost" -MARIADB="nlvmi" -MARIAUSER="root" -MARIAPASS="" +#Path to generate nginx configs +#NGINXCONFIGPATH="/etc/nginx/nlvmi" +#command to reload nginx +#NGINXRESTARTCOMMAND="/etc/init.d/nginx restart" diff --git a/web/header.php b/web/header.php index 8e5f0cb..a098b4e 100644 --- a/web/header.php +++ b/web/header.php @@ -1,5 +1,6 @@ + diff --git a/web/index.php b/web/index.php index 2619e7a..598949e 100644 --- a/web/index.php +++ b/web/index.php @@ -112,7 +112,7 @@ if ($usersfound=="no"){ $user = clean($_POST['username']); $pass = clean($_POST['password']); if ($pass == ""){ - echo "$user is not allowed to login withou password."; + echo "$user is not allowed to login without a password."; } else { $sql="SELECT password,admin FROM users WHERE username='$user'"; $res = $db_handle->query($sql);