Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(xo-server): s3 and encryption at rest are production ready #7515

Merged
merged 5 commits into from
Mar 28, 2024
Merged

feat(xo-server): s3 and encryption at rest are production ready #7515

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e85569
feat(xo-server): s3 and encryption at rest are production ready
fbeauchamp Mar 26, 2024
5568dd0
changelog
fbeauchamp Mar 26, 2024
02a1d28
Update CHANGELOG.unreleased.md
fbeauchamp Mar 27, 2024
7d4c422
remote another text
fbeauchamp Mar 27, 2024
aef94c4
Merge branch 'master' into feat_s3_crypt_in_prod
MathieuRA Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

> Users must be able to say: “Nice enhancement, I'm eager to test it”

- [Remotes] S3 (Object storage) and remote encryption are production ready (PR [#7515](https://github.com/vatesfr/xen-orchestra/pull/7515))

### Bug fixes

> Users must be able to say: “I had this issue, happy to know it's fixed”
Expand All @@ -26,5 +28,5 @@
> Keep this list alphabetically ordered to avoid merge conflicts

<!--packages-start-->

- xo-web minor
<!--packages-end-->
2 changes: 1 addition & 1 deletion packages/xo-web/src/common/intl/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ const messages = {
remoteTypeLocal: 'Local',
remoteTypeNfs: 'NFS',
remoteTypeSmb: 'SMB',
remoteTypeS3: 'Amazon Web Services S3 (beta)',
remoteTypeS3: 'Amazon Web Services S3',
remoteType: 'Type',
remoteSmbWarningMessage:
'SMB remotes are meant to work with Windows Server. For other systems (Linux Samba, which means almost all NAS), please use NFS.',
Expand Down
6 changes: 1 addition & 5 deletions packages/xo-web/src/xo-app/settings/remotes/remote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ export default decorate([
{map(remoteTypes, (label, key) => _({ key }, label, message => <option value={key}>{message}</option>))}
</select>
{type === 'smb' && <em className='text-warning'>{_('remoteSmbWarningMessage')}</em>}
{type === 's3' && <em className='text-warning'>Backup to Amazon S3 is a BETA feature</em>}
</div>
<div className='form-group'>
<input
Expand Down Expand Up @@ -478,10 +477,7 @@ export default decorate([
</fieldset>
)}
<div className='form-group'>
<label>
{_('remoteEncryptionKey')}
<span className='tag tag-pill tag-info ml-1'>{_('alpha')}</span>
</label>
<label>{_('remoteEncryptionKey')}</label>
{isEncrypted && !useVhdDirectory && (
<p className='text-warning'>
<Icon icon='alarm' /> {_('remoteEncryptionMustUseVhd')}
Expand Down