diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 6f5af15..4008093 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,3 +1,3 @@ -# ALL ISSUES SHOULD BE CREATED IN XO-WEB'S TRACKER! +# ALL ISSUES SHOULD BE CREATED IN XEN-ORCHESTRA'S TRACKER! -https://github.com/vatesfr/xo-web/issues +https://github.com/vatesfr/xen-orchestra/issues diff --git a/docs/architecture.md b/docs/architecture.md index d9a38a5..cce28c8 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -20,8 +20,8 @@ Your XOA is connected to all your hosts, or on the pool master only if you are u Xen Orchestra itself is built as a modular solution. Each part has its role: - 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. -- 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*. -- "[xo-cli](https://github.com/vatesfr/xo-cli)" is a module allowing to send commands directly from the command line. +- 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*. +- "[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. 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. diff --git a/docs/contributing.md b/docs/contributing.md index c44e946..4c26b40 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -4,7 +4,7 @@ XO is an Open Source project released under the [AGPL v3](http://www.gnu.org/lic ## Bug reports -You can [open bug reports here](https://github.com/vatesfr/xo-web/issues) (issues, enhancements, ideas etc.). +You can [open bug reports here](https://github.com/vatesfr/xen-orchestra/issues) (issues, enhancements, ideas etc.). ## Documentation / Code diff --git a/docs/from_the_sources.md b/docs/from_the_sources.md index 0b5b699..1d70770 100644 --- a/docs/from_the_sources.md +++ b/docs/from_the_sources.md @@ -8,7 +8,7 @@ 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. -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. +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. ## Packages and Pre-requisites @@ -47,17 +47,14 @@ You need to use the `git` source code manager: ``` git clone -b master http://github.com/vatesfr/xen-orchestra -git clone -b stable http://github.com/vatesfr/xo-web ``` -> Note: xo-server has been migrated to the +> Note: xo-server and xo-web have been migrated to the [xen-orchestra](https://github.com/vatesfr/xen-orchestra) -mono-repository, and xo-web **will migrate in future too**. +mono-repository. ## Installing dependencies -### xo-server - 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: ``` @@ -75,7 +72,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 `xen-orchestra` and `xo-web` are in the same directory). It's near the end of the file: ```yaml - mounts: '/': '../../../xo-web/dist/' + mounts: '/': '../xo-web/dist/' ``` > Note this `dist` folder will be created in the next step (see the `xo-web` section) @@ -91,14 +88,6 @@ WebServer listening on localhost:80 [INFO] Default user: "admin@admin.net" with password "admin" ``` -### xo-web - -First, we'll also install dependencies: - -``` -$ yarn -$ yarn build -``` ## Running XO 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: diff --git a/docs/github.md b/docs/github.md index c69b303..d22e429 100644 --- a/docs/github.md +++ b/docs/github.md @@ -6,7 +6,7 @@ The first time a user signs in, XO will create a new XO user with the same ident First you need to configure a new app in your GitHub account: -![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-github/master/github.png) +![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-github/github.png) When you got your `clientID` and your `clientSecret`, you can configure them in the GitHub Plugin inside "Settings/Plugins" view of Xen Orchestra. diff --git a/docs/google.md b/docs/google.md index a0963f7..91f2e9f 100644 --- a/docs/google.md +++ b/docs/google.md @@ -9,16 +9,16 @@ The first time a user signs in, XO will create a new XO user with the same ident [Create a new project](https://console.developers.google.com/project): -![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/create-project-2.png) +![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/create-project-2.png) Enable the Google+ API: -![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/enable-google+-api.png) +![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/enable-google+-api.png) Add OAuth 2.0 credentials: -![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/add-oauth2-credentials.png) -![](https://raw.githubusercontent.com/vatesfr/xo-server-auth-google/master/add-oauth2-credentials-2.png) +![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/add-oauth2-credentials.png) +![](https://raw.githubusercontent.com/vatesfr/xen-orchestra/master/packages/xo-server-auth-google/add-oauth2-credentials-2.png) ## Configure the XO plugin diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md index e5ef24f..a795b35 100644 --- a/docs/reverse_proxy.md +++ b/docs/reverse_proxy.md @@ -39,7 +39,7 @@ location /[] { proxy_redirect default; - # Issue https://github.com/vatesfr/xo-web/issues/1471 + # Issue https://github.com/vatesfr/xen-orchestra/issues/1471 proxy_read_timeout 1800; # Error will be only every 30m # For the VM import feature, this size must be larger than the file we want to upload. diff --git a/docs/roadmap.md b/docs/roadmap.md index 73b0bee..182d1bf 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,14 +1,14 @@ # Roadmap - - > Our roadmap is very flexible, you can check the milestones repository for a complete overview of all the features we are working on. + + > Our roadmap is very flexible, you can check the milestones repository for a complete overview of all the features we are working on. ## Features -- [Milestones](https://github.com/vatesfr/xo-web/milestones) +- [Milestones](https://github.com/vatesfr/xen-orchestra/milestones) - [Alerts and reports](alerts.md) ## Fixes -- [Known bugs](https://github.com/vatesfr/xo-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+bug%22) -- [Enhancement requests](https://github.com/vatesfr/xo-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+enhancement%22) +- [Known bugs](https://github.com/vatesfr/xen-orchestra/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+bug%22) +- [Enhancement requests](https://github.com/vatesfr/xen-orchestra/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+enhancement%22)