Skip to content

Commit

Permalink
chore: format with Prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-f committed Aug 23, 2022
1 parent ae373c3 commit 74d15e1
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 12 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
2 changes: 1 addition & 1 deletion @xen-orchestra/backups/Backup.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ exports.Backup = class Backup {
})
)
),
() => settings.healthCheckSr !== undefined ? this._getRecord('SR', settings.healthCheckSr) : undefined,
() => (settings.healthCheckSr !== undefined ? this._getRecord('SR', settings.healthCheckSr) : undefined),
async (srs, remoteAdapters, healthCheckSr) => {
// remove adapters that failed (already handled)
remoteAdapters = remoteAdapters.filter(_ => _ !== undefined)
Expand Down
6 changes: 3 additions & 3 deletions @xen-orchestra/backups/_cleanVm.integ.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ test('it remove backup meta data referencing a missing vhd in delta backup', asy
const logInfo = message => {
loggued += message + '\n'
}
await adapter.cleanVm('/', { remove: true, logInfo, logWarn: logInfo , lock: false})
await adapter.cleanVm('/', { remove: true, logInfo, logWarn: logInfo, lock: false })
let matched = loggued.match(/deleting unused VHD/g) || []
expect(matched.length).toEqual(1) // only one vhd should have been deleted

Expand All @@ -179,7 +179,7 @@ test('it remove backup meta data referencing a missing vhd in delta backup', asy
{ flags: 'w' }
)
loggued = ''
await adapter.cleanVm('/', { remove: true, logInfo, logWarn: () => {} , lock: false})
await adapter.cleanVm('/', { remove: true, logInfo, logWarn: () => {}, lock: false })
matched = loggued.match(/deleting unused VHD/g) || []
expect(matched.length).toEqual(2) // all vhds (orphan and child ) should have been deleted
})
Expand Down Expand Up @@ -271,7 +271,7 @@ test('it finish unterminated merge ', async () => {
})
)

await adapter.cleanVm('/', { remove: true, merge: true, logWarn: ()=>{}, lock: false})
await adapter.cleanVm('/', { remove: true, merge: true, logWarn: () => {}, lock: false })
// merging is already tested in vhd-lib, don't retest it here (and theses vhd are as empty as my stomach at 12h12)

// only check deletion
Expand Down
10 changes: 5 additions & 5 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

We apply patches and fix security issues for the following versions:

| Version | Supported |
| ------- | ------------------ |
| XOA `latest` | :white_check_mark: |
| XOA `stable` | :white_check_mark: |
| `master` branch | :white_check_mark: |
| Version | Supported |
| --------------- | ------------------ |
| XOA `latest` | :white_check_mark: |
| XOA `stable` | :white_check_mark: |
| `master` branch | :white_check_mark: |
| anything else | :x: |

## Reporting a Vulnerability
Expand Down
3 changes: 3 additions & 0 deletions docs/backup_troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,13 @@ As a temporary workaround you can increase the timeout higher than the default v
:::

Create the following file:

```
/etc/xo-server/config.httpInactivityTimeout.toml
```

Add the following lines:

```
# XOA Support - Work-around HTTP timeout issue during backups
[xapiOptions]
Expand Down
2 changes: 2 additions & 0 deletions docs/xoa.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,14 @@ You can verify that your time is correctly set with the `date` command. To set X
## Setting a custom NTP server

By default, XOA is configured to use the standard Debian NTP servers:

```
pool 0.debian.pool.ntp.org iburst
pool 1.debian.pool.ntp.org iburst
pool 2.debian.pool.ntp.org iburst
pool 3.debian.pool.ntp.org iburst
```

If you'd like to use your own NTP server or another pool, you can make the changes directly in `/etc/ntp.conf`.

You will need to be root to edit this file (or use `sudo`). We recommend adding your custom server to the top of the list, leaving the debian server entries if possible.
Expand Down
2 changes: 1 addition & 1 deletion packages/xo-server-auth-saml/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const configurationSchema = {
properties: {
callbackUrl: {
title: 'callbackUrl',
description: "the callback URL",
description: 'the callback URL',
type: 'string',
},
cert: {
Expand Down
3 changes: 2 additions & 1 deletion packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ const CleanVmTask = ({ children, className, task }) =>
) : null
const HealthCheckTask = ({ children, className, task }) => (
<li className={className}>
<Icon icon='health' /> {task.message} <TaskStateInfos status={task.status} /> <TaskWarnings warnings={task.warnings} />
<Icon icon='health' /> {task.message} <TaskStateInfos status={task.status} />{' '}
<TaskWarnings warnings={task.warnings} />
{children}
<TaskStart task={task} />
<TaskEnd task={task} />
Expand Down

0 comments on commit 74d15e1

Please sign in to comment.