hassio-addons/addon-tasmoadmin
1
0
Fork 0
mirror of https://github.com/hassio-addons/addon-tasmoadmin.git synced 2025-05-04 11:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

🔨 Rebranding to TasmoAdmin

Browse source
This commit is contained in:
Franck Nijhof 2018-06-13 20:17:07 +02:00 • committed by Franck Nijhof
parent df688cbae2
commit 70ca14ad7c
29 changed files with 116 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/settings.yml vendored
View file

@ -1,8 +1,8 @@
--- ---
repository: repository:
description: "SonWEB - Community Hass.io Add-on for Home Assistant" description: "TasmoAdmin - Community Hass.io Add-on for Home Assistant"
homepage: https://addons.community homepage: https://addons.community
topics: sonoff, tasmota, sonweb, hassio-addons, hassio, hass, home-assistant, homeassistant topics: sonoff, tasmota, tasmoadmin, hassio-addons, hassio, hass, home-assistant, homeassistant
private: false private: false
has_issues: true has_issues: true
has_projects: false has_projects: false

2
.github/support.yml vendored
View file

@ -12,7 +12,7 @@ supportComment: >
support channels to get help with the project. support channels to get help with the project.
Head over to the Head over to the
[Home Assistant community forum](https://community.home-assistant.io/t/community-hass-io-add-on-sonweb/54155?u=frenck) [Home Assistant community forum](https://community.home-assistant.io/t/community-hass-io-add-on-tasmoadmin/54155?u=frenck)
or join our [Discord](https://discord.gg/c5DvZ4e) chat. or join our [Discord](https://discord.gg/c5DvZ4e) chat.
# Close issues marked as support requests # Close issues marked as support requests

6
.gitlab-ci.yml
View file

@ -2,9 +2,9 @@
image: docker:stable image: docker:stable
variables: variables:
ADDON_GITHUB_REPO: hassio-addons/addon-sonweb ADDON_GITHUB_REPO: hassio-addons/addon-tasmoadmin
ADDON_SLUG: sonweb ADDON_SLUG: tasmoadmin
ADDON_TARGET: sonweb ADDON_TARGET: tasmoadmin
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_HUB_ORG: hassioaddons DOCKER_HUB_ORG: hassioaddons

4
CONTRIBUTING.md
View file

@ -25,5 +25,5 @@ Even better: You could submit a pull request with a fix / new feature!
developers, or if you do not have permission to do that, you may request developers, or if you do not have permission to do that, you may request
the second reviewer to merge it for you. the second reviewer to merge it for you.
[github]: https://github.com/hassio-addons/addon-sonweb/issues [github]: https://github.com/hassio-addons/addon-tasmoadmin/issues
[prs]: https://github.com/hassio-addons/addon-sonweb/pulls [prs]: https://github.com/hassio-addons/addon-tasmoadmin/pulls

91
README.md
View file

@ -1,4 +1,4 @@
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
[![GitHub Release][releases-shield]][releases] [![GitHub Release][releases-shield]][releases]
![Project Stage][project-stage-shield] ![Project Stage][project-stage-shield]
@ -16,12 +16,13 @@
Centrally manage all your Sonoff-Tasmota devices. Centrally manage all your Sonoff-Tasmota devices.
![SonWEB screenshot](images/screenshot.png) ![TasmoAdmin screenshot](images/screenshot.png)
## About ## About
SonWEB is an administrative web interface to manage all your Sonoff-Tasmota TasmoAdmin (formerly known as SonWEB) is an administrative web interface to
flashed devices centrally. Some of its features: manage all your Sonoff-Tasmota flashed devices centrally.
Some of its features:
- Scans your networks and adds your devices automatically - Scans your networks and adds your devices automatically
- See the status off all your devices quick and easy - See the status off all your devices quick and easy
@ -35,9 +36,9 @@ The installation of this add-on is pretty straightforward and not different in
comparison to installing any other Hass.io add-on. comparison to installing any other Hass.io add-on.
1. [Add our Hass.io add-ons repository][repository] to your Hass.io instance. 1. [Add our Hass.io add-ons repository][repository] to your Hass.io instance.
1. Install the "SonWEB" add-on. 1. Install the "TasmoAdmin" add-on.
1. Start the "SonWEB" add-on. 1. Start the "TasmoAdmin" add-on.
1. Check the logs of the “SonWEB” add-on to see if everything went well. 1. Check the logs of the “TasmoAdmin” add-on to see if everything went well.
**NOTE**: Do not add this repository to Hass.io, please use: **NOTE**: Do not add this repository to Hass.io, please use:
`https://github.com/hassio-addons/repository`. `https://github.com/hassio-addons/repository`.
@ -102,7 +103,7 @@ you are troubleshooting.
### Option: `ssl` ### Option: `ssl`
Enables/Disables SSL (HTTPS) on the web interface of SonWEB Enables/Disables SSL (HTTPS) on the web interface of TasmoAdmin
Panel. Set it `true` to enable it, `false` otherwise. Panel. Set it `true` to enable it, `false` otherwise.
### Option: `certfile` ### Option: `certfile`
@ -123,7 +124,7 @@ Set this option too `false` to disable IPv6 support.
## Embedding into Home Assistant ## Embedding into Home Assistant
It is possible to embed the SonWEB interface directly into Home Assistant, It is possible to embed the TasmoAdmin interface directly into Home Assistant,
allowing you to access it through the Home Assistant frontend. allowing you to access it through the Home Assistant frontend.
Home Assistant provides the `panel_iframe` component, for these purposes. Home Assistant provides the `panel_iframe` component, for these purposes.
@ -132,8 +133,8 @@ Example configuration:
```yaml ```yaml
panel_iframe: panel_iframe:
sonweb: tasmoadmin:
title: SonWEB title: TasmoAdmin
icon: mdi:lightbulb-on icon: mdi:lightbulb-on
url: http://addres.to.your.hass.io:9541 url: http://addres.to.your.hass.io:9541
``` ```
@ -215,58 +216,58 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
[aarch64-anchore-shield]: https://anchore.io/service/badges/image/db1960b51d33fe80c8a6f3318f327532c3a7f1f501c767dfa3d9202196982e2f [aarch64-anchore-shield]: https://anchore.io/service/badges/image/db1960b51d33fe80c8a6f3318f327532c3a7f1f501c767dfa3d9202196982e2f
[aarch64-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Fsonweb-aarch64%3Alatest [aarch64-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Ftasmoadmin-aarch64%3Alatest
[aarch64-arch-shield]: https://img.shields.io/badge/architecture-aarch64-blue.svg [aarch64-arch-shield]: https://img.shields.io/badge/architecture-aarch64-blue.svg
[aarch64-dockerhub]: https://hub.docker.com/r/hassioaddons/sonweb-aarch64 [aarch64-dockerhub]: https://hub.docker.com/r/hassioaddons/tasmoadmin-aarch64
[aarch64-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/sonweb-aarch64.svg [aarch64-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/tasmoadmin-aarch64.svg
[aarch64-microbadger]: https://microbadger.com/images/hassioaddons/sonweb-aarch64 [aarch64-microbadger]: https://microbadger.com/images/hassioaddons/tasmoadmin-aarch64
[aarch64-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/sonweb-aarch64.svg [aarch64-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/tasmoadmin-aarch64.svg
[aarch64-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/sonweb-aarch64.svg [aarch64-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/tasmoadmin-aarch64.svg
[amd64-anchore-shield]: https://anchore.io/service/badges/image/67ef5b927a8e861eee9e576477f4f6f1e52ccc30c657e906720a8fa3a9fe5fc7 [amd64-anchore-shield]: https://anchore.io/service/badges/image/67ef5b927a8e861eee9e576477f4f6f1e52ccc30c657e906720a8fa3a9fe5fc7
[amd64-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Fsonweb-amd64%3Alatest [amd64-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Ftasmoadmin-amd64%3Alatest
[amd64-arch-shield]: https://img.shields.io/badge/architecture-amd64-blue.svg [amd64-arch-shield]: https://img.shields.io/badge/architecture-amd64-blue.svg
[amd64-dockerhub]: https://hub.docker.com/r/hassioaddons/sonweb-amd64 [amd64-dockerhub]: https://hub.docker.com/r/hassioaddons/tasmoadmin-amd64
[amd64-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/sonweb-amd64.svg [amd64-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/tasmoadmin-amd64.svg
[amd64-microbadger]: https://microbadger.com/images/hassioaddons/sonweb-amd64 [amd64-microbadger]: https://microbadger.com/images/hassioaddons/tasmoadmin-amd64
[amd64-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/sonweb-amd64.svg [amd64-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/tasmoadmin-amd64.svg
[amd64-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/sonweb-amd64.svg [amd64-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/tasmoadmin-amd64.svg
[armhf-anchore-shield]: https://anchore.io/service/badges/image/f2968fbefd4a99acfd25c100c099fcc1a5ae486289ca5b3548efde4c02583cc4 [armhf-anchore-shield]: https://anchore.io/service/badges/image/f2968fbefd4a99acfd25c100c099fcc1a5ae486289ca5b3548efde4c02583cc4
[armhf-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Fsonweb-armhf%3Alatest [armhf-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Ftasmoadmin-armhf%3Alatest
[armhf-arch-shield]: https://img.shields.io/badge/architecture-armhf-blue.svg [armhf-arch-shield]: https://img.shields.io/badge/architecture-armhf-blue.svg
[armhf-dockerhub]: https://hub.docker.com/r/hassioaddons/sonweb-armhf [armhf-dockerhub]: https://hub.docker.com/r/hassioaddons/tasmoadmin-armhf
[armhf-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/sonweb-armhf.svg [armhf-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/tasmoadmin-armhf.svg
[armhf-microbadger]: https://microbadger.com/images/hassioaddons/sonweb-armhf [armhf-microbadger]: https://microbadger.com/images/hassioaddons/tasmoadmin-armhf
[armhf-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/sonweb-armhf.svg [armhf-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/tasmoadmin-armhf.svg
[armhf-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/sonweb-armhf.svg [armhf-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/tasmoadmin-armhf.svg
[bountysource-shield]: https://img.shields.io/bountysource/team/hassio-addons/activity.svg [bountysource-shield]: https://img.shields.io/bountysource/team/hassio-addons/activity.svg
[bountysource]: https://www.bountysource.com/teams/hassio-addons/issues [bountysource]: https://www.bountysource.com/teams/hassio-addons/issues
[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg [buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
[buymeacoffee]: https://www.buymeacoffee.com/frenck [buymeacoffee]: https://www.buymeacoffee.com/frenck
[commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/addon-sonweb.svg [commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/addon-tasmoadmin.svg
[commits]: https://github.com/hassio-addons/addon-sonweb/commits/master [commits]: https://github.com/hassio-addons/addon-tasmoadmin/commits/master
[contributors]: https://github.com/hassio-addons/addon-sonweb/graphs/contributors [contributors]: https://github.com/hassio-addons/addon-tasmoadmin/graphs/contributors
[discord-shield]: https://img.shields.io/discord/330944238910963714.svg [discord-shield]: https://img.shields.io/discord/330944238910963714.svg
[discord]: https://discord.gg/c5DvZ4e [discord]: https://discord.gg/c5DvZ4e
[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-sonweb/54155?u=frenck [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-tasmoadmin/54155?u=frenck
[frenck]: https://github.com/frenck [frenck]: https://github.com/frenck
[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-sonweb/badges/master/pipeline.svg [gitlabci-shield]: https://gitlab.com/hassio-addons/addon-tasmoadmin/badges/master/pipeline.svg
[gitlabci]: https://gitlab.com/hassio-addons/addon-sonweb/pipelines [gitlabci]: https://gitlab.com/hassio-addons/addon-tasmoadmin/pipelines
[i386-anchore-shield]: https://anchore.io/service/badges/image/bfa0ec04d5a8519ccfaf3be75bcd92bd1d9821946e39368d2b88d7d14d16e58e [i386-anchore-shield]: https://anchore.io/service/badges/image/bfa0ec04d5a8519ccfaf3be75bcd92bd1d9821946e39368d2b88d7d14d16e58e
[i386-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Fsonweb-i386%3Alatest [i386-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Ftasmoadmin-i386%3Alatest
[i386-arch-shield]: https://img.shields.io/badge/architecture-i386-blue.svg [i386-arch-shield]: https://img.shields.io/badge/architecture-i386-blue.svg
[i386-dockerhub]: https://hub.docker.com/r/hassioaddons/sonweb-i386 [i386-dockerhub]: https://hub.docker.com/r/hassioaddons/tasmoadmin-i386
[i386-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/sonweb-i386.svg [i386-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/tasmoadmin-i386.svg
[i386-microbadger]: https://microbadger.com/images/hassioaddons/sonweb-i386 [i386-microbadger]: https://microbadger.com/images/hassioaddons/tasmoadmin-i386
[i386-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/sonweb-i386.svg [i386-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/tasmoadmin-i386.svg
[i386-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/sonweb-i386.svg [i386-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/tasmoadmin-i386.svg
[issue]: https://github.com/hassio-addons/addon-sonweb/issues [issue]: https://github.com/hassio-addons/addon-tasmoadmin/issues
[keepchangelog]: http://keepachangelog.com/en/1.0.0/ [keepchangelog]: http://keepachangelog.com/en/1.0.0/
[license-shield]: https://img.shields.io/github/license/hassio-addons/addon-sonweb.svg [license-shield]: https://img.shields.io/github/license/hassio-addons/addon-tasmoadmin.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg [maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
[reddit]: https://reddit.com/r/homeassistant [reddit]: https://reddit.com/r/homeassistant
[releases-shield]: https://img.shields.io/github/release/hassio-addons/addon-sonweb.svg [releases-shield]: https://img.shields.io/github/release/hassio-addons/addon-tasmoadmin.svg
[releases]: https://github.com/hassio-addons/addon-sonweb/releases [releases]: https://github.com/hassio-addons/addon-tasmoadmin/releases
[repository]: https://github.com/hassio-addons/repository [repository]: https://github.com/hassio-addons/repository
[semver]: http://semver.org/spec/v2.0.0.html [semver]: http://semver.org/spec/v2.0.0.html

57
sonweb/rootfs/etc/cont-init.d/12-patches.sh
View file

@ -1,57 +0,0 @@
#!/usr/bin/with-contenv bash
# ==============================================================================
# Community Hass.io Add-ons: SonWEB
# Applies patch to remove SelfUpdate, since that is useless shit in Docker
# ==============================================================================
# shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh
patch -F2 -R --ignore-whitespace /var/www/sonweb/includes/header.php <<'PATCH'
--- header.php 2018-05-22 00:00:00.463304792 +0200
+++ header.php 2018-05-22 00:00:00.291634513 +0200
@@ -178,6 +178,15 @@
</li>
<?php endif; ?>
+ <?php if ( $loggedin ): ?>
+ <li class="nav-item">
+ <a class="nav-link <?php echo $page == "selfupdate" ? "active" : ""; ?>"
+ href='<?php echo _BASEURL_; ?>selfupdate'>
+ <?php echo __( "SELFUPDATE", "NAVI" ); ?>
+ </a>
+ </li>
+ <?php endif; ?>
+
</ul>
PATCH
# shellcheck disable=SC2181
if [[ "$?" -ne 0 ]];
then
hass.die 'Patching SonWEB SelfUpdate failed'
fi
hass.log.debug 'Applied SonWEB SelfUpdate fix'
patch -F2 -R --ignore-whitespace \
/var/www/sonweb/pages/device_update.php << 'PATCH'
--- device_update.php 2018-05-23 21:31:36.000000000 +0200
+++ device_update.php 2018-05-23 21:30:19.000000000 +0200
@@ -5,7 +5,7 @@
$subdir = str_replace( "\\", "/", $subdir );
$subdir = $subdir == "/" ? "" : $subdir;
- $otaServer = $_SERVER['REQUEST_SCHEME'] . "://".$localIP.":".$_SERVER[ "SERVER_PORT" ]._BASEURL_."";
+ $otaServer = "http://".$localIP.":".$_SERVER[ "SERVER_PORT" ]._BASEURL_."";
if ( isset( $_POST[ 'minimal_firmware_path' ] ) && !empty( $_POST[ 'minimal_firmware_path' ] ) ) {
$ota_minimal_firmware_url = $otaServer."data/firmwares/sonoff-minimal.bin";
PATCH
# shellcheck disable=SC2181
if [[ "$?" -ne 0 ]];
then
hass.die 'Patching SonWEB OTA over HTTPS failed'
fi
hass.log.debug 'Applied SonWEB OTA over HTTPS fix'

2
sonweb/rootfs/etc/fix-attrs.d/01-sonweb
View file

@ -1,2 +0,0 @@
/var/www/sonweb true nginx 0644 0755
/data/sonweb true nginx 0644 0755

2
sonweb/rootfs/etc/php7/blacklist.txt
View file

@ -1,2 +0,0 @@
/data/sonweb/*
/var/www/sonweb/data/*

13
sonweb/.README.j2 → tasmoadmin/.README.j2
View file

@ -1,4 +1,4 @@
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield] [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
@ -10,8 +10,9 @@ Centrally manage all your Sonoff-Tasmota devices.
## About ## About
SonWEB is an administrative web interface to manage all your Sonoff-Tasmota TasmoAdmin (formerly known as SonWEB) is an administrative web interface to
flashed devices centrally. Some of its features: manage all your Sonoff-Tasmota flashed devices centrally.
Some of its features:
- Scans your networks and adds your devices automatically - Scans your networks and adds your devices automatically
- See the status off all your devices quick and easy - See the status off all your devices quick and easy
@ -21,7 +22,7 @@ flashed devices centrally. Some of its features:
[Click here for the full documentation][docs] [Click here for the full documentation][docs]
![SonWEB screenshot][screenshot] ![TasmoAdmin screenshot][screenshot]
{% if channel == "edge" %} {% if channel == "edge" %}
## WARNING! THIS IS AN EDGE VERSION! ## WARNING! THIS IS AN EDGE VERSION!
@ -68,9 +69,9 @@ If you are more interested in stable releases of our add-ons:
[discord]: https://discord.gg/c5DvZ4e [discord]: https://discord.gg/c5DvZ4e
[docs]: {{ repo }}/blob/{{ version }}/README.md [docs]: {{ repo }}/blob/{{ version }}/README.md
[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-sonweb/54155?u=frenck [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-tasmoadmin/54155?u=frenck
[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg [maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
[release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg [release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg
[release]: {{ repo }}/tree/{{ version }} [release]: {{ repo }}/tree/{{ version }}
[screenshot]: https://github.com/hassio-addons/addon-sonweb/raw/master/images/screenshot.png [screenshot]: https://github.com/hassio-addons/addon-tasmoadmin/raw/master/images/screenshot.png

24
sonweb/Dockerfile → tasmoadmin/Dockerfile
View file

@ -19,16 +19,16 @@ RUN \
git=2.15.0-r1 \ git=2.15.0-r1 \
\ \
&& git clone --branch master --single-branch \ && git clone --branch master --single-branch \
https://github.com/reloxx13/SonWEB.git /var/www/sonweb \ https://github.com/reloxx13/TasmoAdmin.git /var/www/tasmoadmin \
&& git -C /var/www/sonweb checkout 74704ba33f7b4df0d5fd75c55253356edbb65029 \ && git -C /var/www/tasmoadmin checkout 74704ba33f7b4df0d5fd75c55253356edbb65029 \
\ \
&& apk del --purge .build-dependencies \ && apk del --purge .build-dependencies \
\ \
&& rm -f -r /var/www/sonweb/.git \ && rm -f -r /var/www/tasmoadmin/.git \
&& find /var/www/sonweb -type f -name ".htaccess" -depth -exec rm -f {} \; \ && find /var/www/tasmoadmin -type f -name ".htaccess" -depth -exec rm -f {} \; \
&& find /var/www/sonweb -type f -name "*.md" -depth -exec rm -f {} \; \ && find /var/www/tasmoadmin -type f -name "*.md" -depth -exec rm -f {} \; \
&& find /var/www/sonweb -type f -name ".gitignore" -depth -exec rm -f {} \; \ && find /var/www/tasmoadmin -type f -name ".gitignore" -depth -exec rm -f {} \; \
&& find /var/www/sonweb -type f -name ".empty" -depth -exec rm -f {} \; && find /var/www/tasmoadmin -type f -name ".empty" -depth -exec rm -f {} \;
# Copy root filesystem # Copy root filesystem
COPY rootfs / COPY rootfs /
@ -41,7 +41,7 @@ ARG BUILD_VERSION
# Labels # Labels
LABEL \ LABEL \
io.hass.name="SonWEB" \ io.hass.name="TasmoAdmin" \
io.hass.description="Centrally manage all your Sonoff-Tasmota devices" \ io.hass.description="Centrally manage all your Sonoff-Tasmota devices" \
io.hass.arch="${BUILD_ARCH}" \ io.hass.arch="${BUILD_ARCH}" \
io.hass.type="addon" \ io.hass.type="addon" \
@ -49,10 +49,10 @@ LABEL \
maintainer="Franck Nijhof <frenck@addons.community>" \ maintainer="Franck Nijhof <frenck@addons.community>" \
org.label-schema.description="Centrally manage all your Sonoff-Tasmota devices" \ org.label-schema.description="Centrally manage all your Sonoff-Tasmota devices" \
org.label-schema.build-date=${BUILD_DATE} \ org.label-schema.build-date=${BUILD_DATE} \
org.label-schema.name="SonWEB" \ org.label-schema.name="TasmoAdmin" \
org.label-schema.schema-version="1.0" \ org.label-schema.schema-version="1.0" \
org.label-schema.url="https://community.home-assistant.io/t/community-hass-io-add-on-sonweb/54155?u=frenck" \ org.label-schema.url="https://community.home-assistant.io/t/community-hass-io-add-on-tasmoadmin/54155?u=frenck" \
org.label-schema.usage="https://github.com/hassio-addons/addon-sonweb/tree/master/README.md" \ org.label-schema.usage="https://github.com/hassio-addons/addon-tasmoadmin/tree/master/README.md" \
org.label-schema.vcs-ref=${BUILD_REF} \ org.label-schema.vcs-ref=${BUILD_REF} \
org.label-schema.vcs-url="https://github.com/hassio-addons/addon-sonweb" \ org.label-schema.vcs-url="https://github.com/hassio-addons/addon-tasmoadmin" \
org.label-schema.vendor="Community Hass.io Addons" org.label-schema.vendor="Community Hass.io Addons"

0
sonweb/build.json → tasmoadmin/build.json
View file

4
sonweb/config.json → tasmoadmin/config.json
View file

@ -1,9 +1,9 @@
{ {
"name": "SonWEB", "name": "TasmoAdmin",
"version": "dev", "version": "dev",
"slug": "sonweb", "slug": "sonweb",
"description": "Centrally manage all your Sonoff-Tasmota devices", "description": "Centrally manage all your Sonoff-Tasmota devices",
"url": "https://community.home-assistant.io/t/community-hass-io-add-on-sonweb/54155?u=frenck", "url": "https://community.home-assistant.io/t/community-hass-io-add-on-tasmoadmin/54155?u=frenck",
"webui": "[PROTO:ssl]://[HOST]:[PORT:9541]", "webui": "[PROTO:ssl]://[HOST]:[PORT:9541]",
"startup": "system", "startup": "system",
"arch": [ "arch": [

0
sonweb/icon.png → tasmoadmin/icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

0
sonweb/logo.png → tasmoadmin/logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Before After
Before After

2
sonweb/rootfs/etc/cont-init.d/10-requirements.sh → tasmoadmin/rootfs/etc/cont-init.d/10-requirements.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
# This files check if all user configuration requirements are met # This files check if all user configuration requirements are met
# ============================================================================== # ==============================================================================
# shellcheck disable=SC1091 # shellcheck disable=SC1091

4
sonweb/rootfs/etc/cont-init.d/11-nginx.sh → tasmoadmin/rootfs/etc/cont-init.d/11-nginx.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
# Configures NGINX for use with SonWEB # Configures NGINX for use with TasmoAdmin
# ============================================================================== # ==============================================================================
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh source /usr/lib/hassio-addons/base.sh

19
tasmoadmin/rootfs/etc/cont-init.d/12-migrate.sh Normal file
View file

@ -0,0 +1,19 @@
#!/usr/bin/with-contenv bash
# ==============================================================================
# Community Hass.io Add-ons: TasmoAdmin
# Migrates data from sonweb to TasmoAdmin
# ==============================================================================
# shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh
if hass.directory_exists "/data/sonweb"; then
hass.log.inf 'Migrating data from sonweb to tasmoadmin...'
# Rename data folder
mv /data/sonweb /data/tasmoadmin
# Ensure file permissions
chown -R nginx:nginx /data/tasmoadmin
find /data/tasmoadmin -not -perm 0644 -type f -exec chmod 0644 {} \;
find /data/tasmoadmin -not -perm 0755 -type d -exec chmod 0755 {} \;
fi

16
sonweb/rootfs/etc/cont-init.d/13-persistent-data.sh → tasmoadmin/rootfs/etc/cont-init.d/13-persistent-data.sh
View file

@ -1,23 +1,23 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
# Ensures data is store in a persistent location # Ensures data is store in a persistent location
# ============================================================================== # ==============================================================================
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh source /usr/lib/hassio-addons/base.sh
if ! hass.directory_exists "/data/sonweb"; then if ! hass.directory_exists "/data/tasmoadmin"; then
hass.log.debug 'Data directory not initialized, doing that now...' hass.log.debug 'Data directory not initialized, doing that now...'
# Setup structure # Setup structure
cp -R /var/www/sonweb/data /data/sonweb cp -R /var/www/tasmoadmin/data /data/tasmoadmin
# Ensure file permissions # Ensure file permissions
chown -R nginx:nginx /data/sonweb chown -R nginx:nginx /data/tasmoadmin
find /data/sonweb -not -perm 0644 -type f -exec chmod 0644 {} \; find /data/tasmoadmin -not -perm 0644 -type f -exec chmod 0644 {} \;
find /data/sonweb -not -perm 0755 -type d -exec chmod 0755 {} \; find /data/tasmoadmin -not -perm 0755 -type d -exec chmod 0755 {} \;
fi fi
hass.log.debug 'Symlinking data directory to persistent storage location...' hass.log.debug 'Symlinking data directory to persistent storage location...'
rm -f -r /var/www/sonweb/data rm -f -r /var/www/tasmoadmin/data
ln -s /data/sonweb /var/www/sonweb/data ln -s /data/tasmoadmin /var/www/tasmoadmin/data

2
tasmoadmin/rootfs/etc/fix-attrs.d/01-tasmoadmin Normal file
View file

@ -0,0 +1,2 @@
/var/www/tasmoadmin true nginx 0644 0755
/data/tasmoadmin true nginx 0644 0755

2
sonweb/rootfs/etc/nginx/nginx-ssl.conf → tasmoadmin/rootfs/etc/nginx/nginx-ssl.conf
View file

@ -16,7 +16,7 @@ http {
server_name hassio.local; server_name hassio.local;
listen 9541 default_server ssl; listen 9541 default_server ssl;
listen [::]:9541 default_server ssl; listen [::]:9541 default_server ssl;
root /var/www/sonweb; root /var/www/tasmoadmin;
index index.php; index index.php;
ssl_certificate /ssl/%%certfile%%; ssl_certificate /ssl/%%certfile%%;

2
sonweb/rootfs/etc/nginx/nginx.conf → tasmoadmin/rootfs/etc/nginx/nginx.conf
View file

@ -16,7 +16,7 @@ http {
server_name hassio.local; server_name hassio.local;
listen 9541 default_server; listen 9541 default_server;
listen [::]:9541 default_server; listen [::]:9541 default_server;
root /var/www/sonweb/; root /var/www/tasmoadmin/;
index index.php; index index.php;
location /data/firmwares { location /data/firmwares {

2
tasmoadmin/rootfs/etc/php7/blacklist.txt Normal file
View file

@ -0,0 +1,2 @@
/data/tasmoadmin/*
/var/www/tasmoadmin/data/*

0
sonweb/rootfs/etc/php7/conf.d/99-sonweb.ini → tasmoadmin/rootfs/etc/php7/conf.d/99-tasmoadmin.ini
View file

0
sonweb/rootfs/etc/php7/php-fpm.d/www.conf → tasmoadmin/rootfs/etc/php7/php-fpm.d/www.conf
View file

2
sonweb/rootfs/etc/services.d/nginx/finish → tasmoadmin/rootfs/etc/services.d/nginx/finish
View file

@ -1,6 +1,6 @@
#!/usr/bin/execlineb -S0 #!/usr/bin/execlineb -S0
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
# Take down the S6 supervision tree when Nginx fails # Take down the S6 supervision tree when Nginx fails
# ============================================================================== # ==============================================================================
if -n { s6-test $# -ne 0 } if -n { s6-test $# -ne 0 }

2
sonweb/rootfs/etc/services.d/nginx/run → tasmoadmin/rootfs/etc/services.d/nginx/run
View file

@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
# Runs the Nginx daemon # Runs the Nginx daemon
# ============================================================================== # ==============================================================================
# shellcheck disable=SC1091 # shellcheck disable=SC1091

2
sonweb/rootfs/etc/services.d/php-fpm/finish → tasmoadmin/rootfs/etc/services.d/php-fpm/finish
View file

@ -1,6 +1,6 @@
#!/usr/bin/execlineb -S0 #!/usr/bin/execlineb -S0
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
# Take down the S6 supervision tree when PHP FPM fails # Take down the S6 supervision tree when PHP FPM fails
# ============================================================================== # ==============================================================================
if -n { s6-test $# -ne 0 } if -n { s6-test $# -ne 0 }

2
sonweb/rootfs/etc/services.d/php-fpm/run → tasmoadmin/rootfs/etc/services.d/php-fpm/run
View file

@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: SonWEB # Community Hass.io Add-ons: TasmoAdmin
# Runs the PHP-FPM daemon # Runs the PHP-FPM daemon
# ============================================================================== # ==============================================================================
# shellcheck disable=SC1091 # shellcheck disable=SC1091

1
tasmoadmin/rootfs/var/www/tasmoadmin/.dockerenv Normal file
View file

@ -0,0 +1 @@
# Disables updater