Skip to content

Commit

Permalink
Adjust software module options to match recent changes (#332)
Browse files Browse the repository at this point in the history
* Bazarr: adjust module options to match changes
* Deluge: adjust module options to match changes
* Docker: adjust module options to match changes
* Emby server: adjust module options to match changes
* HAOS: adjust module options to match changes
* OpenHab: adjust module options to match changes
* qbittorrent: adjust module options to match changes
* Transmission: adjust module options to match changes
* sabnzbd: adjust module options to match changes
* Medusa: adjust module options to match changes
* Sonarr: adjust module options to match changes
* Radarr: adjust module options to match changes
* Lidarr and Readarr: adjust module options to match changes
* SWAG: adjust module options to match changes
* Jellyserr and Mariadb: adjust module options to match changes
* Nextcloud and Netdata: adjust module options to match changes
* Owncloud and Phpmyadmin: adjust module options to match changes
* Pi-hole and Prowlarr: adjust module options to match changes
* Sirling and Uptime kuma: adjust module options to match changes
* Syncthing and watchtower: adjust module options to match changes
* Portainer and Webmin: adjust module options to match changes
* Several minor fixes
  • Loading branch information
igorpecovnik authored Dec 24, 2024
1 parent fdf5a93 commit f0213ad
Show file tree
Hide file tree
Showing 74 changed files with 1,412 additions and 811 deletions.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added tools/include/images/MED003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/include/markdown/HA003-header.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ Perfect to run on any single board computer with 4 cores and at least 512Mb of m

Home Assistant on Armbian runs supervised in a Docker container. This secures same functionality as stock HAOS.

- Config directory: `/usr/share/haos`
- Config directory: `/armbian/haos`
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions tools/include/markdown/MED003-footer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
=== "Access to the web interface"

The web interface is accessible via port **8096**:

- URL: `https://<your.IP>:8096`

=== "Directories"

- Install directory: `/armbian/emby`
- Site configuration directory: `/armbian/emby/config`
- Data directory: `/armbian/emby/tvshows` `/armbian/emby/movies`

=== "View logs"

```sh
docker logs -f emby
```
1 change: 1 addition & 0 deletions tools/include/markdown/MED003-header.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Emby organizes video, music, live TV, and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone emby Media Server.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
782 changes: 485 additions & 297 deletions tools/json/config.software.json

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions tools/json/config.system.json
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,29 @@
"status": "Disabled",
"author": "@igorpecovnik",
"condition": "[ -f /etc/armbian-distribution-status ] && release_upgrade rolling verify"
},
{
"id": "WTC001",
"description": "Enable automating Docker container base images updating",
"command": [
"module_watchtower install"
],
"status": "Stable",
"author": "@armbian",
"condition": "! module_watchtower status && pkg_installed docker-ce"
},
{
"id": "WTC002",
"description": "Disable automating Docker container base images updating",
"command": [
"module_watchtower remove"
],
"status": "Stable",
"author": "@armbian",
"condition": "module_watchtower status && pkg_installed docker-ce"
}


]
}
]
Expand Down
1 change: 1 addition & 0 deletions tools/modules/functions/set_runtime_variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ function set_runtime_variables() {
DEFAULT_ADAPTER=$(ip -4 route ls | grep default | tail -1 | grep -Po '(?<=dev )(\S+)')
LOCALIPADD=$(ip -4 addr show dev $DEFAULT_ADAPTER | awk '/inet/ {print $2}' | cut -d'/' -f1)
LOCALSUBNET=$(echo ${LOCALIPADD} | cut -d"." -f1-3).0/24
LOCALWHITELIST=$(echo ${LOCALIPADD} | cut -d"." -f1-3)".*" # for transmission
BACKTITLE="Contribute: https://github.com/armbian/configng"
TITLE="Armbian configuration utility"
[[ -z "${DEFAULT_ADAPTER// /}" ]] && DEFAULT_ADAPTER="lo"
Expand Down
52 changes: 36 additions & 16 deletions tools/modules/runtime/config.runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,48 @@ fi
#plex_media_port="$(lsof -i -P -n | grep TCP | grep LISTEN | grep 'plex' | awk -F: '{print $2}' | awk '{print $1}' | head -n 1)"
#update_sub_submenu_data "Software" "Media" "SW22" "https://localhost:$plex_media_port"

# System
update_sub_submenu_data "System" "Storage" "SY220" "$(module_zfs zfs_version)"
update_sub_submenu_data "System" "Storage" "SY221" "$(module_zfs zfs_installed_version)"
update_sub_submenu_data "System" "Storage" "NFS04" "$NFS_CLIENTS_NUMBER"

# Database
update_sub_submenu_data "Software" "Database" "DAT002" "Server: $LOCALIPADD"
update_sub_submenu_data "Software" "Database" "DAT006" "http://$LOCALIPADD:${module_options["module_phpmyadmin,port"]}"
update_sub_submenu_data "Software" "Media" "MED006" "http://$LOCALIPADD:${module_options["module_stirling,port"]}"
update_sub_submenu_data "Software" "Media" "MED016" "http://$LOCALIPADD:${module_options["module_syncthing,port"]}"

# Media
update_sub_submenu_data "Software" "Media" "MED002" "http://$LOCALIPADD:${module_options["module_plexmediaserver,port"]}"
update_sub_submenu_data "Software" "Media" "MED004" "http://$LOCALIPADD:${module_options["module_embyserver,port"]}"
update_sub_submenu_data "Software" "Media" "MED011" "http://$LOCALIPADD:${module_options["module_stirling,port"]}"
update_sub_submenu_data "Software" "Media" "MED016" "http://$LOCALIPADD:${module_options["module_syncthing,port"]%% *}" # removing second port from url
update_sub_submenu_data "Software" "Media" "MED021" "https://$LOCALIPADD:${module_options["module_nextcloud,port"]}"
update_sub_submenu_data "Software" "Media" "MED026" "http://$LOCALIPADD:${module_options["module_owncloud,port"]}"
update_sub_submenu_data "Software" "Containers" "CON006" "http://$LOCALIPADD:${module_options["module_portainer,port"]}"
update_sub_submenu_data "Software" "HomeAutomation" "HA004" "http://$LOCALIPADD:${module_options["module_haos,port"]}"
update_sub_submenu_data "Software" "Monitoring" "MON004" "http://$LOCALIPADD:${module_options["module_netdata,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW002" "http://$LOCALIPADD:${module_options["module_qbittorrent,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW004" "http://$LOCALIPADD:${module_options["module_deluge,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW006" "http://$LOCALIPADD:${module_options["module_transmission,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW012" "http://$LOCALIPADD:${module_options["module_sabnzbd,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW014" "http://$LOCALIPADD:${module_options["module_medusa,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW016" "http://$LOCALIPADD:${module_options["module_sonarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW018" "http://$LOCALIPADD:${module_options["module_radarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW020" "http://$LOCALIPADD:${module_options["module_bazarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW022" "http://$LOCALIPADD:${module_options["module_lidarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW024" "http://$LOCALIPADD:${module_options["module_readarr,port"]}"

# Containers
update_sub_submenu_data "Software" "Containers" "CON006" "http://$LOCALIPADD:${module_options["module_portainer,port"]%% *}" # removing second port from url

# Home automation
update_sub_submenu_data "Software" "HomeAutomation" "HAB002" "http://$LOCALIPADD:${module_options["module_openhab,port"]}"
update_sub_submenu_data "Software" "HomeAutomation" "HAS002" "http://$LOCALIPADD:${module_options["module_haos,port"]}"

# DNS
update_sub_submenu_data "Software" "DNS" "DNS003" "http://$LOCALIPADD:${module_options["module_pi_hole,port"]%% *}" # removing second port from url

# Monitoring
update_sub_submenu_data "Software" "Monitoring" "MON002" "http://$LOCALIPADD:${module_options["module_uptimekuma,port"]}"
update_sub_submenu_data "Software" "Monitoring" "MON006" "http://$LOCALIPADD:${module_options["module_netdata,port"]}"

# Downloaders
update_sub_submenu_data "Software" "Downloaders" "DOW002" "http://$LOCALIPADD:${module_options["module_qbittorrent,port"]%% *}" # removing second port from url
update_sub_submenu_data "Software" "Downloaders" "DEL002" "http://$LOCALIPADD:${module_options["module_deluge,port"]%% *}" # removing second port from url
update_sub_submenu_data "Software" "Downloaders" "TRA002" "http://$LOCALIPADD:${module_options["module_transmission,port"]%% *}" # removing second port from url
update_sub_submenu_data "Software" "Downloaders" "SABN02" "http://$LOCALIPADD:${module_options["module_sabnzbd,port"]}"
update_sub_submenu_data "Software" "Downloaders" "MDS002" "http://$LOCALIPADD:${module_options["module_medusa,port"]}"
update_sub_submenu_data "Software" "Downloaders" "SON002" "http://$LOCALIPADD:${module_options["module_sonarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "RAD002" "http://$LOCALIPADD:${module_options["module_radarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "BAZ002" "http://$LOCALIPADD:${module_options["module_bazarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "LID002" "http://$LOCALIPADD:${module_options["module_lidarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "RDR002" "http://$LOCALIPADD:${module_options["module_readarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW026" "http://$LOCALIPADD:${module_options["module_prowlarr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "DOW041" "http://$LOCALIPADD:${module_options["module_jellyseerr,port"]}"
update_sub_submenu_data "Software" "Downloaders" "JEL002" "http://$LOCALIPADD:${module_options["module_jellyseerr,port"]}"

41 changes: 0 additions & 41 deletions tools/modules/software/install_docker.sh

This file was deleted.

23 changes: 0 additions & 23 deletions tools/modules/software/install_embyserver.sh

This file was deleted.

45 changes: 0 additions & 45 deletions tools/modules/software/install_openhab.sh

This file was deleted.

101 changes: 0 additions & 101 deletions tools/modules/software/install_pi-hole.sh

This file was deleted.

24 changes: 0 additions & 24 deletions tools/modules/software/install_plexmediaserver.sh

This file was deleted.

Loading

0 comments on commit f0213ad

Please sign in to comment.