Skip to content

Commit

Permalink
Update to separate deb pkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
raoulh committed Dec 5, 2023
1 parent e3ec917 commit dd5ada4
Show file tree
Hide file tree
Showing 19 changed files with 33 additions and 459 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ install: install-lib ## Install the binaries
install -Dm755 scripts/init_calaosfs.sh $(DESTDIR)$(PREFIX)/sbin/init_calaosfs.sh
install -Dm755 scripts/haproxy_pre.sh $(DESTDIR)$(PREFIX)/sbin/haproxy_pre.sh
install -Dm755 scripts/mosquitto_pre.sh $(DESTDIR)$(PREFIX)/sbin/mosquitto_pre.sh
install -Dm755 scripts/zigbee2mqtt_pre.sh $(DESTDIR)$(PREFIX)/sbin/zigbee2mqtt_pre.sh
install -Dm755 scripts/load_containers_cache.sh $(DESTDIR)$(PREFIX)/sbin/load_containers_cache.sh
install -Dm755 scripts/arch-chroot $(DESTDIR)$(PREFIX)/sbin/arch-chroot
install -Dm755 scripts/genfstab $(DESTDIR)$(PREFIX)/sbin/genfstab
install -Dm755 scripts/start_z2mqtt.sh $(DESTDIR)$(PREFIX)/sbin/start_z2mqtt.sh
install -Dm755 scripts/genfstab $(DESTDIR)$(PREFIX)/sbin/genfstab
34 changes: 0 additions & 34 deletions debian/calaos-home.service

This file was deleted.

32 changes: 0 additions & 32 deletions debian/calaos-server.service

This file was deleted.

29 changes: 0 additions & 29 deletions debian/grafana.service

This file was deleted.

31 changes: 0 additions & 31 deletions debian/haproxy.service

This file was deleted.

30 changes: 0 additions & 30 deletions debian/influxdb.service

This file was deleted.

31 changes: 0 additions & 31 deletions debian/mosquitto.service

This file was deleted.

1 change: 0 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ override_dh_installsystemd:
dh_installsystemd --name=calaos-home
dh_installsystemd --name=haproxy
dh_installsystemd --name=mosquitto
dh_installsystemd --name=zigbee2mqtt --no-enable
dh_installsystemd --name=influxdb --no-enable
dh_installsystemd --name=grafana --no-enable
dh_installsystemd --name=grub-btrfsd --no-enable
Expand Down
24 changes: 0 additions & 24 deletions debian/zigbee2mqtt.service

This file was deleted.

1 change: 1 addition & 0 deletions env/calaos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export CALAOS_HAPROXY_PATH="/mnt/calaos/haproxy"
export CALAOS_CERT_FILE="/mnt/calaos/haproxy/server.pem"
export CALAOS_CONFIG="/mnt/calaos/config"
export CALAOS_HAPROXY_TEMPLATE_PATH="/usr/share/calaos-ddns"
export CALAOSDNS_CACHE_DIR="/mnt/calaos/calaos-ddns"

alias calaos_config='podman exec calaos-server /opt/bin/calaos_config'
alias calaos_1wire='podman exec calaos-server /opt/bin/calaos_1wire'
Expand Down
File renamed without changes.
File renamed without changes.
108 changes: 0 additions & 108 deletions scripts/haproxy_pre.sh

This file was deleted.

File renamed without changes.
File renamed without changes.
31 changes: 31 additions & 0 deletions scripts/pull_calaos_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/bash

# Check if pkgname parameter is provided
if [ -z "$1" ]; then
echo "Please provide the pkgname parameter."
exit 1
fi

pkgname="$1"
url="/usr/share/calaos/$pkgname.source"

# Check if the source file exists
if [ ! -f "$url" ]; then
echo "Source file $url does not exist."
exit 1
fi

# Read the URL from the source file
image_url=$(cat "$url")

echo " > Pulling image $image_url"
podman pull "$image_url"

# Clean old remaining container images
echo " > Cleaning old images"
podman image prune -f

# Remove old tags if they exist
if podman image exists "localhost/var/lib/cache/containers/$pkgname"; then
podman rmi "localhost/var/lib/cache/containers/$pkgname"
fi
Loading

0 comments on commit dd5ada4

Please sign in to comment.