Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = coolerdash
pkgdesc = Plug-in for CoolerControl that extends the LCD functionality with additional features
pkgver = 2.1.0
pkgver = 3.1.1
pkgrel = 1
url = https://github.com/damachine/coolerdash
install = coolerdash.install
Expand All @@ -18,5 +18,6 @@ pkgbase = coolerdash
conflicts = coolerdash-git
replaces = coolerdash-git
backup = etc/coolercontrol/plugins/coolerdash/config.json
backup = etc/coolercontrol/plugins/coolerdash/credentials.json

pkgname = coolerdash
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,10 @@ install: check-deps $(TARGET)
else \
$(INSTALL) -m 600 etc/coolercontrol/plugins/coolerdash/config.json "$(DESTDIR)$(PLUGINDIR)/config.json"; \
fi
@if [ -f "$(DESTDIR)$(PLUGINDIR)/credentials.json" ]; then \
chmod 600 "$(DESTDIR)$(PLUGINDIR)/credentials.json"; \
printf " $(GREEN)Credentials:$(RESET) Existing credentials.json preserved (chmod 600)\n"; \
fi
@$(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)/ui"
@$(INSTALL_DATA) etc/coolercontrol/plugins/coolerdash/ui/index.html "$(DESTDIR)$(PLUGINDIR)/ui/index.html"
@$(INSTALL_DATA) images/shutdown.png "$(DESTDIR)$(PLUGINDIR)/shutdown.png"
Expand All @@ -360,6 +364,7 @@ install: check-deps $(TARGET)
@sed -i 's/{{VERSION}}/$(VERSION)/g' "$(DESTDIR)$(PLUGINDIR)/ui/index.html"
@printf " $(GREEN)Binary:$(RESET) $(DESTDIR)$(libexecdir)/coolerdash/coolerdash\n"
@printf " $(GREEN)Config JSON:$(RESET) $(DESTDIR)$(PLUGINDIR)/config.json (chmod 600)\n"
@printf " $(GREEN)Credentials:$(RESET) $(DESTDIR)$(PLUGINDIR)/credentials.json (chmod 600)\n"
@printf " $(GREEN)Web UI:$(RESET) $(DESTDIR)$(PLUGINDIR)/ui/index.html\n"
@printf " $(GREEN)Plugin Lib:$(RESET) Served by CoolerControl at /plugins/lib/cc-plugin-lib.js\n"
@printf " $(GREEN)Plugin:$(RESET) $(DESTDIR)$(PLUGINDIR)/manifest.toml\n"
Expand Down
3 changes: 2 additions & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ license=('MIT')
depends=('cairo' 'jansson' 'libcurl-gnutls' 'ttf-roboto')
makedepends=('gcc' 'make' 'pkg-config' 'git')
optdepends=()
backup=('etc/coolercontrol/plugins/coolerdash/config.json')
backup=('etc/coolercontrol/plugins/coolerdash/config.json'
'etc/coolercontrol/plugins/coolerdash/credentials.json')
install=coolerdash.install
source=()
sha256sums=()
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.1.1
3 changes: 2 additions & 1 deletion aur/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ url="https://github.com/damachine/coolerdash"
license=('MIT')
depends=('cairo' 'coolercontrol' 'jansson' 'libcurl-gnutls' 'ttf-roboto')
makedepends=('gcc' 'make' 'pkg-config' 'git')
backup=('etc/coolercontrol/plugins/coolerdash/config.json')
backup=('etc/coolercontrol/plugins/coolerdash/config.json'
'etc/coolercontrol/plugins/coolerdash/credentials.json')
install=coolerdash.install
_commit=
source=("coolerdash-git::git+https://github.com/damachine/coolerdash.git#commit=${_commit}")
Expand Down
5 changes: 5 additions & 0 deletions aur/coolerdash.install
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ post_install() {

# Ensure correct permissions on config.json
chmod 600 /etc/coolercontrol/plugins/coolerdash/config.json 2>/dev/null || true
chmod 600 /etc/coolercontrol/plugins/coolerdash/credentials.json 2>/dev/null || true

systemctl daemon-reload

Expand All @@ -58,6 +59,8 @@ post_install() {

echo "================================================================"
echo "CoolerDash installed successfully."
echo "Set your Access Token in the CoolerDash Settings UI."
echo "The token is auto-persisted to credentials.json on startup."
echo "================================================================"
}

Expand All @@ -71,6 +74,7 @@ post_upgrade() {

# Ensure correct permissions on config.json
chmod 600 /etc/coolercontrol/plugins/coolerdash/config.json 2>/dev/null || true
chmod 600 /etc/coolercontrol/plugins/coolerdash/credentials.json 2>/dev/null || true

systemctl daemon-reload

Expand All @@ -83,6 +87,7 @@ post_upgrade() {
echo "CoolerDash upgraded successfully."
echo "Note: config.json is preserved. If a new template was shipped,"
echo " compare it with /etc/coolercontrol/plugins/coolerdash/config.json.pacnew"
echo "Note: credentials.json is never overwritten by updates."
echo "================================================================"
}

Expand Down
5 changes: 5 additions & 0 deletions coolerdash.install
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ post_install() {

# Ensure correct permissions on config.json
chmod 600 /etc/coolercontrol/plugins/coolerdash/config.json 2>/dev/null || true
chmod 600 /etc/coolercontrol/plugins/coolerdash/credentials.json 2>/dev/null || true

systemctl daemon-reload

Expand All @@ -58,6 +59,8 @@ post_install() {

echo "================================================================"
echo "CoolerDash installed successfully."
echo "Set your Access Token in the CoolerDash Settings UI."
echo "The token is auto-persisted to credentials.json on startup."
echo "================================================================"
}

Expand All @@ -71,6 +74,7 @@ post_upgrade() {

# Ensure correct permissions on config.json
chmod 600 /etc/coolercontrol/plugins/coolerdash/config.json 2>/dev/null || true
chmod 600 /etc/coolercontrol/plugins/coolerdash/credentials.json 2>/dev/null || true

systemctl daemon-reload

Expand All @@ -83,6 +87,7 @@ post_upgrade() {
echo "CoolerDash upgraded successfully."
echo "Note: config.json is preserved. If a new template was shipped,"
echo " compare it with /etc/coolercontrol/plugins/coolerdash/config.json.pacnew"
echo "Note: credentials.json is never overwritten by updates."
echo "================================================================"
}

Expand Down
3 changes: 1 addition & 2 deletions etc/coolercontrol/plugins/coolerdash/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"_comment": "CoolerDash Plugin Configuration - All values with defaults",

"daemon": {
"address": "http://localhost:11987",
"access_token": ""
"address": "http://localhost:11987"
},

"device_detection": {
Expand Down
2 changes: 1 addition & 1 deletion etc/coolercontrol/plugins/coolerdash/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
id = "coolerdash"
type = "integration"
version = "{{VERSION}}"
description = "Monitor telemetry data on an AIO liquid cooler with an integrated LCD display"
description = "Plug-in for CoolerControl that extends the LCD functionality with additional features"
executable = "/usr/libexec/coolerdash/coolerdash"
#args = "--verbose"
privileged = true
Expand Down
2 changes: 1 addition & 1 deletion etc/coolercontrol/plugins/coolerdash/ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ <h3 class="section-title">Authentication &mdash; CC4 (Bearer Token)</h3>
</div>
<div class="form-group">
<label class="form-label">Access Token</label>
<span class="form-hint">Enter a CC4 Bearer token (cc_&hellip;). After saving, the token is stored securely in <code>config.json</code> (chmod 600). If a token is already set, the field shows <strong>***</strong> &mdash; enter a new value to replace it, or leave <strong>***</strong> unchanged.</span>
<span class="form-hint">Enter a CC4 Bearer token (cc_&hellip;). After saving, the token is automatically persisted to <code>credentials.json</code> (chmod 600) so it survives package updates. If a token is already set, the field shows <strong>***</strong> &mdash; enter a new value to replace it, or leave <strong>***</strong> unchanged.</span>
<input type="password" name="daemon.access_token" class="form-control" autocomplete="off" spellcheck="false" placeholder="cc_xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx">
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions packaging/coolerdash.spec
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ fi
if [ -f /etc/coolercontrol/plugins/coolerdash/config.json ]; then
chmod 600 /etc/coolercontrol/plugins/coolerdash/config.json
fi
if [ -f /etc/coolercontrol/plugins/coolerdash/credentials.json ]; then
chmod 600 /etc/coolercontrol/plugins/coolerdash/credentials.json
fi
# Remove legacy files
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
rm -f /etc/systemd/system/coolerdash-helperd.service
Expand Down
2 changes: 2 additions & 0 deletions packaging/debian/conffiles
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/etc/coolercontrol/plugins/coolerdash/config.json
/etc/coolercontrol/plugins/coolerdash/credentials.json
Loading
Loading