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.

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

samba: Migrate add-on layout to S6 Overlay #3001

Merged
merged 4 commits into from
Nov 12, 2023
Merged

samba: Migrate add-on layout to S6 Overlay #3001

merged 4 commits into from
Nov 12, 2023

Conversation

lmagyar
Copy link
Contributor

@lmagyar lmagyar commented Apr 22, 2023

No functional change.

Just migrates files to new S6 layout.

I saw a planned update to Alpine 3.17 and thought it's a good time to change this also.

@frenck
Copy link
Member

frenck commented Apr 22, 2023

I have this + a bunch of more changes ready to go, adding things like adding health checks. I was awaiting #2997...

This PR is running through my planned maintenance. It is not a problem, but this is just wasted energy from both you and me at this point. :(

../Frenck

@lmagyar
Copy link
Contributor Author

lmagyar commented Apr 22, 2023

OK, closing, no problem. :)
Made another small PR, no more PR planned from me.

@lmagyar lmagyar closed this Apr 22, 2023
@lmagyar lmagyar deleted the pr-samba-s6-overlay branch April 22, 2023 11:28
@lmagyar lmagyar restored the pr-samba-s6-overlay branch April 22, 2023 11:28
@frenck
Copy link
Member

frenck commented Apr 22, 2023

I don't think you need to close this PR? Like... I will be re-opening the same one 🤷

(efforts have already been duplicated, that is all).

@lmagyar
Copy link
Contributor Author

lmagyar commented Apr 22, 2023

OK, I simply didn't want to disturb you. I reopened it and made it draft like the other #3002.

I will wait for the next samba release before I click anything. :)

@lmagyar lmagyar reopened this Apr 22, 2023
@lmagyar lmagyar marked this pull request as draft April 22, 2023 12:16
@github-actions github-actions bot added stale and removed stale labels Jul 3, 2023
@github-actions github-actions bot added the stale label Sep 7, 2023
@github-actions github-actions bot closed this Sep 14, 2023
@lmagyar
Copy link
Contributor Author

lmagyar commented Oct 1, 2023

Can be reopened, github actions bot didn't send notification about the stale label on this draft PR, only when closed it.

@agners agners reopened this Oct 2, 2023
@github-actions github-actions bot removed the stale label Oct 2, 2023
samba/rootfs/etc/s6-overlay/s6-rc.d/smbd/finish Outdated Show resolved Hide resolved
samba/rootfs/etc/s6-overlay/s6-rc.d/nmbd/finish Outdated Show resolved Hide resolved
@lmagyar lmagyar marked this pull request as ready for review November 11, 2023 15:03
@@ -1,5 +1,5 @@
---
version: 11.0.0
version: 11.1.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version: 11.1.0
version: 11.0.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding this one, to avoid the upgrade/release. Got another PR inbound for the 11.1.0

Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @lmagyar 👍

../Frenck

@frenck frenck merged commit b91defb into home-assistant:master Nov 12, 2023
9 checks passed
@lmagyar lmagyar deleted the pr-samba-s6-overlay branch November 12, 2023 14:23
danveitch76 added a commit to danveitch76/hassio-addons that referenced this pull request Feb 23, 2024
## 12.2.0-nas1a

###  ✨ Features
- New `mqtt_nexgen_entities` option and scripts to enable new MQTT integration. This will be the default system for future integration is more efficent and use less resources but now is **Experimental**
- `automount` now see also APFS drivers
- Support reuse names from reserved share disabled  (for [#188](dianlight/hassio-addons#188))
- Move addon config in `addons_config`
- Homeassitant Automount also with different user in acl
- ✨ [REQUEST] Support for APFS formatted hard drives [#184](dianlight/hassio-addons#184) - Only ReadOnly for now
- Added mount options default is set to 'nosuid,relatime,noexec' [cherry pick from PR#167] ([DOCS.md][docs])
- Added filter for reserved sharenames (config addons ssl share backup media) [cherry pick from PR#167]

### 💥 BREAKING CHANGE
- Removed deprecated `mqtt_use_legacy_entities` option and scripts.
- Drop support for `armhf` and `i386`
- "vfat" "msdos" "f2fs" "fuseblk" and "exfat" are now marked unsupported for timemachine.
- Internal HA Storage Mount is done with a generated superuser

###  🩹 BugFix
- 🐛 [Samba NAS] Auto mount fails afterupgrade to 12.1.0-nas [#181](dianlight/hassio-addons#181)
- SambaNAS - error after update /etc/s6-overlay/s6-rc.d/init-samba/run: line 47: /tmp/local_mount.json: No such file or directory [#194](dianlight/hassio-addons#194)
- 🐛 [SambaNAS] Can't mount moredisks with label that contains a reserved word as substring [#188](dianlight/hassio-addons#188)
- 🐛 [sambanas] 0x80070032 The request is not supported [#182](dianlight/hassio-addons#182)
- 🐛 [SAMBA NAS] Unable to upload or rename files in external usb  [#171](dianlight/hassio-addons#171)
- 🐛 [SAMBA NAS] Getting error 100093 when trying to add a file via SMB on an external exFat disk attached to the pi [#175](dianlight/hassio-addons#175)
- Fix mount concurrency. Solve some issue on addon-restart. (try to resolve [#159](dianlight/hassio-addons#159))

### 🏗 Chore
- [Full Changelog from official addon 12.2.0][changelog_12.2.0]
  - Decrease Samba log level (Skipped. Loglevel is configurable)
- Update Based Image to 15.0.3 (Alpine 3.19.0)

### 🧪 Experimental
- Rework on all MQTT client implementation. [In Progress]
- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
danveitch76 added a commit to danveitch76/hassio-addons that referenced this pull request Feb 23, 2024
- New `mqtt_nexgen_entities` option and scripts to enable new MQTT integration. This will be the default system for future integration is more efficent and use less resources but now is **Experimental**
- `automount` now see also APFS drivers
- Support reuse names from reserved share disabled  (for [#188](dianlight/hassio-addons#188))
- Move addon config in `addons_config`
- Homeassitant Automount also with different user in acl
- ✨ [REQUEST] Support for APFS formatted hard drives [#184](dianlight/hassio-addons#184) - Only ReadOnly for now
- Added mount options default is set to 'nosuid,relatime,noexec' [cherry pick from PR#167] ([DOCS.md][docs])
- Added filter for reserved sharenames (config addons ssl share backup media) [cherry pick from PR#167]

- Removed deprecated `mqtt_use_legacy_entities` option and scripts.
- Drop support for `armhf` and `i386`
- "vfat" "msdos" "f2fs" "fuseblk" and "exfat" are now marked unsupported for timemachine.
- Internal HA Storage Mount is done with a generated superuser

- 🐛 [SambaNAS] Auto mount fails afterupgrade to 12.1.0-nas [#181](dianlight/hassio-addons#181)
- 🐛 [SambaNAS] - error after update /etc/s6-overlay/s6-rc.d/init-samba/run: line 47: /tmp/local_mount.json: No such file or directory [#194](dianlight/hassio-addons#194)
- 🐛 [SambaNAS] Can't mount moredisks with label that contains a reserved word as substring [#188](dianlight/hassio-addons#188)
- 🐛 [SambaNAS] 0x80070032 The request is not supported [#182](dianlight/hassio-addons#182)
- 🐛 [SambaNAS] Unable to upload or rename files in external usb  [#171](dianlight/hassio-addons#171)
- 🐛 [SambaNAS] Getting error 100093 when trying to add a file via SMB on an external exFat disk attached to the pi [#175](dianlight/hassio-addons#175)
- 🐛 [SambaNAS] Fix mount concurrency. Solve some issue on addon-restart. (try to resolve [#159](dianlight/hassio-addons#159))
- 🐛 [SambaNAS] Changing file permissions on SambaNAS

- [Full Changelog from official addon 12.2.0][changelog_12.2.0]
  - Decrease Samba log level (Skipped. Loglevel is configurable)
- Update Based Image to 15.0.3 (Alpine 3.19.0)

- Rework on all MQTT client implementation. [In Progress]
- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
danveitch76 added a commit to danveitch76/hassio-addons that referenced this pull request Feb 23, 2024
- New `mqtt_nexgen_entities` option and scripts to enable new MQTT integration. This will be the default system for future integration is more efficent and use less resources but now is **Experimental**
- `automount` now see also APFS drivers
- Support reuse names from reserved share disabled  (for [#188](dianlight/hassio-addons#188))
- Move addon config in `addons_config`
- Homeassitant Automount also with different user in acl
- ✨ [REQUEST] Support for APFS formatted hard drives [#184](dianlight/hassio-addons#184) - Only ReadOnly for now
- Added mount options default is set to 'nosuid,relatime,noexec' [cherry pick from PR#167] ([DOCS.md][docs])
- Added filter for reserved sharenames (config addons ssl share backup media) [cherry pick from PR#167]

- Removed deprecated `mqtt_use_legacy_entities` option and scripts.
- Drop support for `armhf` and `i386`
- "vfat" "msdos" "f2fs" "fuseblk" and "exfat" are now marked unsupported for timemachine.
- Internal HA Storage Mount is done with a generated superuser

- 🐛 [SambaNAS] Auto mount fails afterupgrade to 12.1.0-nas [#181](dianlight/hassio-addons#181)
- 🐛 [SambaNAS] - error after update /etc/s6-overlay/s6-rc.d/init-samba/run: line 47: /tmp/local_mount.json: No such file or directory [#194](dianlight/hassio-addons#194)
- 🐛 [SambaNAS] Can't mount moredisks with label that contains a reserved word as substring [#188](dianlight/hassio-addons#188)
- 🐛 [SambaNAS] 0x80070032 The request is not supported [#182](dianlight/hassio-addons#182)
- 🐛 [SambaNAS] Unable to upload or rename files in external usb  [#171](dianlight/hassio-addons#171)
- 🐛 [SambaNAS] Getting error 100093 when trying to add a file via SMB on an external exFat disk attached to the pi [#175](dianlight/hassio-addons#175)
- 🐛 [SambaNAS] Fix mount concurrency. Solve some issue on addon-restart. (try to resolve [#159](dianlight/hassio-addons#159))
- 🐛 [SambaNAS] Changing file permissions on SambaNAS

- [Full Changelog from official addon 12.2.0][changelog_12.2.0]
  - Decrease Samba log level (Skipped. Loglevel is configurable)
- Update Based Image to 15.0.3 (Alpine 3.19.0)

- Rework on all MQTT client implementation. [In Progress]
- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
danveitch76 added a commit to danveitch76/hassio-addons that referenced this pull request Feb 23, 2024
- New `mqtt_nexgen_entities` option and scripts to enable new MQTT integration. This will be the default system for future integration is more efficent and use less resources but now is **Experimental**
- `automount` now see also APFS drivers
- Support reuse names from reserved share disabled  (for [#188](dianlight/hassio-addons#188))
- Move addon config in `addons_config`
- Homeassitant Automount also with different user in acl
- ✨ [REQUEST] Support for APFS formatted hard drives [#184](dianlight/hassio-addons#184) - Only ReadOnly for now
- Added mount options default is set to 'nosuid,relatime,noexec' [cherry pick from PR#167] ([DOCS.md][docs])
- Added filter for reserved sharenames (config addons ssl share backup media) [cherry pick from PR#167]

- Removed deprecated `mqtt_use_legacy_entities` option and scripts.
- Drop support for `armhf` and `i386`
- "vfat" "msdos" "f2fs" "fuseblk" and "exfat" are now marked unsupported for timemachine.
- Internal HA Storage Mount is done with a generated superuser

- 🐛 [SambaNAS] Auto mount fails afterupgrade to 12.1.0-nas [#181](dianlight/hassio-addons#181)
- 🐛 [SambaNAS] - error after update /etc/s6-overlay/s6-rc.d/init-samba/run: line 47: /tmp/local_mount.json: No such file or directory [#194](dianlight/hassio-addons#194)
- 🐛 [SambaNAS] Can't mount moredisks with label that contains a reserved word as substring [#188](dianlight/hassio-addons#188)
- 🐛 [SambaNAS] 0x80070032 The request is not supported [#182](dianlight/hassio-addons#182)
- 🐛 [SambaNAS] Unable to upload or rename files in external usb  [#171](dianlight/hassio-addons#171)
- 🐛 [SambaNAS] Getting error 100093 when trying to add a file via SMB on an external exFat disk attached to the pi [#175](dianlight/hassio-addons#175)
- 🐛 [SambaNAS] Fix mount concurrency. Solve some issue on addon-restart. (try to resolve [#159](dianlight/hassio-addons#159))
- 🐛 [SambaNAS] Changing file permissions on SambaNAS

- [Full Changelog from official addon 12.2.0][changelog_12.2.0]
  - Decrease Samba log level (Skipped. Loglevel is configurable)
- Update Based Image to 15.0.3 (Alpine 3.19.0)

- Rework on all MQTT client implementation. [In Progress]
- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
danveitch76 added a commit to danveitch76/dianlight-sambanas that referenced this pull request Feb 25, 2024
## 10.0.2-nas4c

###  ✨ Features
- Move addon config in `addons_config`
- Move homeassistant config in `homeassistant_config`

### 💥 BREAKING CHANGE
- Drop support for `armhf` and `i386`
- **This is the last version with** `mqtt_use_legacy_entities`. Legacy implementation will be removed in next version.

### 🏗 Chore
- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

###  🩹 BugFix

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
danveitch76 added a commit to danveitch76/hassio-addons that referenced this pull request Feb 25, 2024
- Move addon config in `addons_config`
- Move homeassistant config in `homeassistant_config`

- Drop support for `armhf` and `i386`
- **This is the last version with** `mqtt_use_legacy_entities`. Legacy implementation will be removed in next version.

- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
danveitch76 added a commit to danveitch76/hassio-addons that referenced this pull request Feb 25, 2024
## 10.0.2-nas4c

###  ✨ Features
- Move addon config in `addons_config`
- Move homeassistant config in `homeassistant_config`

### 💥 BREAKING CHANGE
- Drop support for `armhf` and `i386`
- **This is the last version with** `mqtt_use_legacy_entities`. Legacy implementation will be removed in next version.

### 🏗 Chore
- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

###  🩹 BugFix

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
danveitch76 added a commit to danveitch76/hassio-addons that referenced this pull request Feb 25, 2024
## 10.0.2-nas4c

###  ✨ Features
- Move addon config in `addons_config`
- Move homeassistant config in `homeassistant_config`

### 💥 BREAKING CHANGE
- Drop support for `armhf` and `i386`
- **This is the last version with** `mqtt_use_legacy_entities`. Legacy implementation will be removed in next version.

### 🏗 Chore
- [Full Changelog from official addon 12.1.0][changelog_12.1.0]
  - Use the new Home Assistant folder for the config share
  - Add support for accessing public add-on configurations
- [Full Changelog from official addon 12.0.0][changelog_12.0.0]
  - Adjust location of Home Assistant config to match latest dev/beta Supervisor
- [Full Changelog from official addon 11.0.0][changelog_11.0.0]
  - Add support for accessing public add-on configurations
  - Update Based Image to 14.3.2 (Alpine 3.18.4)
  - Adds HEALTCHECK support
- [Full Changelog from official addon 10.0.2][changelog_10.0.2]
  - Already Implemented: Enable IPv6 ULA and IPv4 link-local addresses by default

###  🩹 BugFix

[changelog_12.1.0]: home-assistant/addons#3312
[changelog_12.0.0]: home-assistant/addons#3311
[changelog_11.1.0]: home-assistant/addons#3001
[changelog_11.0.0]: home-assistant/addons#3297
[changelog_10.0.2]: home-assistant/addons#3062
[changelog_10.0.1]: home-assistant/addons#2997
[changelog_12.2.0]: home-assistant/addons#3002
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants