Skip to content
This repository was archived by the owner on Jun 29, 2018. It is now read-only.

Commit 2246e81

Browse files
julien-folivierlambert
authored andcommitted
xo-web is now in the xen-orchestra monorepo (#121)
1 parent f32f0ee commit 2246e81

8 files changed

+20
-31
lines changed

ISSUE_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# ALL ISSUES SHOULD BE CREATED IN XO-WEB'S TRACKER!
1+
# ALL ISSUES SHOULD BE CREATED IN XEN-ORCHESTRA'S TRACKER!
22

3-
https://github.com/vatesfr/xo-web/issues
3+
https://github.com/vatesfr/xen-orchestra/issues

docs/architecture.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Your XOA is connected to all your hosts, or on the pool master only if you are u
2020

2121
Xen Orchestra itself is built as a modular solution. Each part has its role:
2222
- the core is "[xo-server](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-server/)", a daemon dealing directly with XenServer or XAPI capable hosts. This is where users are stored, and it's the center point for talking to your whole Xen infrastructure.
23-
- the Web interface is in "[xo-web](https://github.com/vatesfr/xo-web)": you are running it directly in your browser. The connection with "xo-server" is done via *WebSockets*.
24-
- "[xo-cli](https://github.com/vatesfr/xo-cli)" is a module allowing to send commands directly from the command line.
23+
- the Web interface is in "[xo-web](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-web)": you are running it directly in your browser. The connection with "xo-server" is done via *WebSockets*.
24+
- "[xo-cli](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-cli)" is a module allowing to send commands directly from the command line.
2525

2626

2727
We already have other modules around it (like the LDAP plugin for example). It allows to use this modular architecture to add further parts later. It's completely flexible, allowing us to adapt Xen Orchestra in every existing work-flow.

docs/contributing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ XO is an Open Source project released under the [AGPL v3](http://www.gnu.org/lic
44

55
## Bug reports
66

7-
You can [open bug reports here](https://github.com/vatesfr/xo-web/issues) (issues, enhancements, ideas etc.).
7+
You can [open bug reports here](https://github.com/vatesfr/xen-orchestra/issues) (issues, enhancements, ideas etc.).
88

99
## Documentation / Code
1010

docs/from_the_sources.md

+4-15
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
This installation is validated against a fresh Debian 8 (Jessie) 64 bits. It should be almost the same on others dpkg systems. For RPMs based OS, it should be close, because most of our dependencies came from NPM and not the OS itself.
1010

11-
As you may have seen, in other parts of the documentation, XO is composed of two parts: [xo-server](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-server/) and [xo-web](https://github.com/vatesfr/xo-web/). They can be installed separately, even on different machines, but for the sake of simplicity we will set them up together.
11+
As you may have seen, in other parts of the documentation, XO is composed of two parts: [xo-server](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-server/) and [xo-web](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-web/). They can be installed separately, even on different machines, but for the sake of simplicity we will set them up together.
1212

1313
## Packages and Pre-requisites
1414

@@ -47,17 +47,14 @@ You need to use the `git` source code manager:
4747

4848
```
4949
git clone -b master http://github.com/vatesfr/xen-orchestra
50-
git clone -b stable http://github.com/vatesfr/xo-web
5150
```
5251

53-
> Note: xo-server has been migrated to the
52+
> Note: xo-server and xo-web have been migrated to the
5453
[xen-orchestra](https://github.com/vatesfr/xen-orchestra)
55-
mono-repository, and xo-web **will migrate in future too**.
54+
mono-repository.
5655

5756
## Installing dependencies
5857

59-
### xo-server
60-
6158
Once you have it, use `yarn`, as the non-root user owning the fetched code, to install the other dependencies. Into `xen-orchestra` directory and launch the following command:
6259

6360
```
@@ -75,7 +72,7 @@ $ cp sample.config.yaml .xo-server.yaml
7572
Edit and uncomment it to have the right path to deliver `xo-web`, because `xo-server` embeds an HTTP server (we assume that `xen-orchestra` and `xo-web` are in the same directory). It's near the end of the file:
7673

7774
```yaml
78-
mounts: '/': '../../../xo-web/dist/'
75+
mounts: '/': '../xo-web/dist/'
7976
```
8077
> Note this `dist` folder will be created in the next step (see the `xo-web` section)
8178

@@ -91,14 +88,6 @@ WebServer listening on localhost:80
9188
[INFO] Default user: "[email protected]" with password "admin"
9289
```
9390

94-
### xo-web
95-
96-
First, we'll also install dependencies:
97-
98-
```
99-
$ yarn
100-
$ yarn build
101-
```
10291
## Running XO
10392

10493
The sole part you have to launch is xo-server which is quite easy to do, just launch the `xo-server` script, which is in the root of xo-server's directory:

docs/github.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The first time a user signs in, XO will create a new XO user with the same ident
66

77
First you need to configure a new app in your GitHub account:
88

9-
![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-github/master/github.png)
9+
![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-github/github.png)
1010

1111
When you got your `clientID` and your `clientSecret`, you can configure them in the GitHub Plugin inside "Settings/Plugins" view of Xen Orchestra.
1212

docs/google.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ The first time a user signs in, XO will create a new XO user with the same ident
99

1010
[Create a new project](https://console.developers.google.com/project):
1111

12-
![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/create-project-2.png)
12+
![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/create-project-2.png)
1313

1414
Enable the Google+ API:
1515

16-
![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/enable-google+-api.png)
16+
![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/enable-google+-api.png)
1717

1818
Add OAuth 2.0 credentials:
1919

20-
![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/add-oauth2-credentials.png)
21-
![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/add-oauth2-credentials-2.png)
20+
![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/add-oauth2-credentials.png)
21+
![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/add-oauth2-credentials-2.png)
2222

2323
## Configure the XO plugin
2424

docs/reverse_proxy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ location /[<path>] {
3939
4040
proxy_redirect default;
4141
42-
# Issue https://github.com/vatesfr/xo-web/issues/1471
42+
# Issue https://github.com/vatesfr/xen-orchestra/issues/1471
4343
proxy_read_timeout 1800; # Error will be only every 30m
4444
4545
# For the VM import feature, this size must be larger than the file we want to upload.

docs/roadmap.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Roadmap
2-
3-
> Our roadmap is very flexible, you can check the milestones repository for a complete overview of all the features we are working on.
2+
3+
> Our roadmap is very flexible, you can check the milestones repository for a complete overview of all the features we are working on.
44
55
## Features
66

7-
- [Milestones](https://github.com/vatesfr/xo-web/milestones)
7+
- [Milestones](https://github.com/vatesfr/xen-orchestra/milestones)
88
- [Alerts and reports](alerts.md)
99

1010

1111
## Fixes
1212

13-
- [Known bugs](https://github.com/vatesfr/xo-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+bug%22)
14-
- [Enhancement requests](https://github.com/vatesfr/xo-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+enhancement%22)
13+
- [Known bugs](https://github.com/vatesfr/xen-orchestra/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+bug%22)
14+
- [Enhancement requests](https://github.com/vatesfr/xen-orchestra/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+enhancement%22)

0 commit comments

Comments
 (0)