From adbc9353f57faea2c190a34f5e997e39ea8a2ef3 Mon Sep 17 00:00:00 2001 From: evook Date: Wed, 22 Apr 2015 18:19:54 +0200 Subject: [PATCH 1/2] Update manual_installation.md --- doc/installation/manual_installation.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/installation/manual_installation.md b/doc/installation/manual_installation.md index a85d13ed7..ee3de19b5 100644 --- a/doc/installation/manual_installation.md +++ b/doc/installation/manual_installation.md @@ -19,20 +19,20 @@ We'll use `n` because it's powerful and flexible. First, you need `curl`. Then, ```bash curl -o /usr/local/bin/n https://raw.githubusercontent.com/visionmedia/n/master/bin/n -chmod +x /usr/local/bin/n -n stable +sudo chmod +x /usr/local/bin/n +sudo n stable ``` We'll consider at this point that you've got a working node on your box. E.g: ``` $ node -v -v0.10.36 +v0.12.2 ``` ### Packages ``` -apt-get install build-essential redis-server libpng-dev git python-minimal +sudo apt-get install build-essential redis-server libpng-dev git python-minimal ``` ## Fetching the Code @@ -51,7 +51,7 @@ git clone http://github.com/vatesfr/xo-web Once you have it, you can use `npm` to install the other dependencies: go into XO-Server directory and launch the following command: ``` -npm install +npm install && npm run build ``` Then, you have to create a config file for XO-Server: @@ -60,12 +60,11 @@ Then, you have to create a config file for XO-Server: cp sample.config.yaml .xo-server.yaml ``` -Edit it to have the right path to deliver XO-Web, because XO-Server embeds an HTTP server (we assume that XO-Server and XO-Web are on the same directory). It's near the end of the file: +Edit and uncomment it to have the right path to deliver XO-Web, because XO-Server embeds an HTTP server (we assume that XO-Server and XO-Web are on the same directory). It's near the end of the file: ```yaml mounts: - '/': - - '../xo-web/dist/' + '/': '../xo-web/dist/' ``` WARNING: YAML is very strict with indentation: use spaces for it, not tabs. @@ -75,7 +74,7 @@ You can try to start XO-Server to see if it works. You should have something lik ``` $ npm start -WebServer listening on 0.0.0.0:80 +WebServer listening on localhost:80 [INFO] Default user: "admin@admin.net" with password "admin" ``` From 2e64660ff64a2dd6e49444cf66fc5c7ec9e8bf78 Mon Sep 17 00:00:00 2001 From: evook Date: Thu, 23 Apr 2015 12:20:57 +0200 Subject: [PATCH 2/2] Update manual_installation.md Removed sudo and added the on descriptive line, necessary for all the lazy perm-root admins. "use `npm`, as the non-root user owning the fetched code" --- doc/installation/manual_installation.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/installation/manual_installation.md b/doc/installation/manual_installation.md index ee3de19b5..c5654dbe4 100644 --- a/doc/installation/manual_installation.md +++ b/doc/installation/manual_installation.md @@ -19,8 +19,8 @@ We'll use `n` because it's powerful and flexible. First, you need `curl`. Then, ```bash curl -o /usr/local/bin/n https://raw.githubusercontent.com/visionmedia/n/master/bin/n -sudo chmod +x /usr/local/bin/n -sudo n stable +chmod +x /usr/local/bin/n +n stable ``` We'll consider at this point that you've got a working node on your box. E.g: @@ -32,7 +32,7 @@ v0.12.2 ### Packages ``` -sudo apt-get install build-essential redis-server libpng-dev git python-minimal +apt-get install build-essential redis-server libpng-dev git python-minimal ``` ## Fetching the Code @@ -48,7 +48,7 @@ git clone http://github.com/vatesfr/xo-web ### XO-Server -Once you have it, you can use `npm` to install the other dependencies: go into XO-Server directory and launch the following command: +Once you have it, use `npm`, as the non-root user owning the fetched code, to install the other dependencies: go into XO-Server directory and launch the following command: ``` npm install && npm run build @@ -63,8 +63,7 @@ cp sample.config.yaml .xo-server.yaml Edit and uncomment it to have the right path to deliver XO-Web, because XO-Server embeds an HTTP server (we assume that XO-Server and XO-Web are on the same directory). It's near the end of the file: ```yaml - mounts: - '/': '../xo-web/dist/' + mounts: '/': '../xo-web/dist/' ``` WARNING: YAML is very strict with indentation: use spaces for it, not tabs.