Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4904589086 | ||
|
|
6f7e149c9a | ||
|
|
df344b4c13 | ||
|
|
d82f213ca7 |
6
.env
6
.env
@@ -1,6 +1,8 @@
|
||||
ENV= #empty|development|debug
|
||||
#empty|development|debug
|
||||
ENV=
|
||||
PHOTO_DIR=images
|
||||
HOST=0.0.0.0
|
||||
PORT=8080
|
||||
INTERVAL_DEFAULT=10
|
||||
LOG_PATH= #path for logger files default .
|
||||
#path for logger files default {executable name}.log
|
||||
LOG_PATH=
|
||||
@@ -113,23 +113,23 @@ jobs:
|
||||
echo "PORT=8080" > $BUILD_DIR/usr/share/$PKG_NAME/.env.template
|
||||
fi
|
||||
|
||||
# 5. Create the systemd Service File
|
||||
cat <<EOF > $BUILD_DIR/etc/systemd/system/$PKG_NAME.service
|
||||
[Unit]
|
||||
Description=Slideshow Application Service
|
||||
After=graphical.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Environment=DISPLAY=:0
|
||||
Environment=XAUTHORITY=/home/youruser/.Xauthority
|
||||
ExecStart=/usr/bin/$PKG_NAME
|
||||
WorkingDirectory=/usr/share/$PKG_NAME
|
||||
Restart=always
|
||||
User=root
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
# 5. Create a Template Autostart File (Instead of Systemd)
|
||||
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/setup
|
||||
cat <<EOF > $BUILD_DIR/usr/share/$PKG_NAME/setup/$PKG_NAME.desktop
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Slideshow App
|
||||
Exec=sh -c ' \
|
||||
i=0; \
|
||||
while [ $i -lt 30 ]; do \
|
||||
if [ "$(ls -A "/media/$REAL_USER" 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then \
|
||||
break; \
|
||||
fi; \
|
||||
i=$((i+1)); \
|
||||
sleep 1; \
|
||||
done; \
|
||||
cd /usr/share/slideshowapp && /usr/bin/slideshowapp'
|
||||
Terminal=false
|
||||
EOF
|
||||
|
||||
# 6. Create Control File
|
||||
@@ -139,28 +139,60 @@ jobs:
|
||||
Section: utils
|
||||
Priority: optional
|
||||
Architecture: $ARCH
|
||||
Maintainer: Your Name <you@example.com>
|
||||
Maintainer: Adrian Zuercher <zuercher@tecamino.ch>
|
||||
Description: Slideshow Application
|
||||
EOF
|
||||
|
||||
# 7. Optional: Add post-install script to enable service automatically
|
||||
echo "create service"
|
||||
cat <<EOF > $BUILD_DIR/DEBIAN/postinst
|
||||
# 7. Add post-install script for Autostart and Permissions
|
||||
cat <<'EOF' > $BUILD_DIR/DEBIAN/postinst
|
||||
#!/bin/sh
|
||||
# Check if .env exists in the target share folder
|
||||
if [ ! -f "/usr/share/$PKG_NAME/.env" ]; then
|
||||
echo "Creating new .env from template..."
|
||||
cp /usr/share/$PKG_NAME/.env.template /usr/share/$PKG_NAME/.env
|
||||
else
|
||||
echo ".env already exists, skipping template copy to preserve settings."
|
||||
set -e # Exit on error
|
||||
|
||||
# 1. Detect the real user
|
||||
# We use 'who' and 'awk' as a fallback because $SUDO_USER is sometimes empty in Gitea/CI environments
|
||||
REAL_USER=${SUDO_USER:-$(who | awk '{print $1}' | head -n1)}
|
||||
|
||||
# If still empty, default to 'mst' or 'pi' (adjust to your primary user)
|
||||
if [ -z "$REAL_USER" ] || [ "$REAL_USER" = "root" ]; then
|
||||
REAL_USER="mst"
|
||||
fi
|
||||
|
||||
echo "reload"
|
||||
systemctl daemon-reload
|
||||
echo "enable service"
|
||||
systemctl enable $PKG_NAME.service
|
||||
echo "start service"
|
||||
systemctl start $PKG_NAME.service
|
||||
USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||
|
||||
echo "Post-install: Target user is $REAL_USER"
|
||||
echo "Post-install: Target home is $USER_HOME"
|
||||
|
||||
# 2. Setup .env from template
|
||||
if [ ! -f "/usr/share/slideshowapp/.env" ]; then
|
||||
echo "Creating .env from template..."
|
||||
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
|
||||
fi
|
||||
|
||||
# 3. Setup Autostart (THE FIX)
|
||||
# We use -p to ensure parent directories exist and set ownership immediately
|
||||
AUTOSTART_DIR="$USER_HOME/.config/autostart"
|
||||
|
||||
if [ -d "$USER_HOME" ]; then
|
||||
echo "Creating autostart directory at $AUTOSTART_DIR"
|
||||
mkdir -p "$AUTOSTART_DIR"
|
||||
cp /usr/share/slideshowapp/setup/slideshowapp.desktop "$AUTOSTART_DIR/"
|
||||
|
||||
# Critical: Change ownership of the folder and the file
|
||||
chown -R "$REAL_USER:$REAL_USER" "$USER_HOME/.config"
|
||||
chmod 644 "$AUTOSTART_DIR/slideshowapp.desktop"
|
||||
else
|
||||
echo "ERROR: Home directory $USER_HOME not found. Autostart not configured."
|
||||
fi
|
||||
|
||||
# 4. Fix Chromium Profile Permissions
|
||||
if [ -d "$USER_HOME/.config/chromium" ]; then
|
||||
echo "Cleaning up Chromium locks for $REAL_USER..."
|
||||
chown -R "$REAL_USER:$REAL_USER" "$USER_HOME/.config/chromium"
|
||||
rm -f "$USER_HOME/.config/chromium/SingletonLock"
|
||||
rm -f "$USER_HOME/.config/chromium/SingletonCookie"
|
||||
fi
|
||||
|
||||
echo "Installation complete."
|
||||
EOF
|
||||
chmod 555 $BUILD_DIR/DEBIAN/postinst
|
||||
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
||||
images/
|
||||
slideshowApp
|
||||
schedule.json
|
||||
*.log
|
||||
2
go.mod
2
go.mod
@@ -3,7 +3,7 @@ module slideshowApp
|
||||
go 1.25.4
|
||||
|
||||
require (
|
||||
gitea.tecamino.com/paadi/tecamino-logger v1.0.0
|
||||
gitea.tecamino.com/paadi/tecamino-logger v1.0.1
|
||||
github.com/gorilla/mux v1.8.1
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
github.com/joho/godotenv v1.5.1
|
||||
|
||||
4
go.sum
4
go.sum
@@ -1,5 +1,5 @@
|
||||
gitea.tecamino.com/paadi/tecamino-logger v1.0.0 h1:Quk0UJerOCy7xbHWYOuBXk0FQIgx4arjVDMt2ahvaO0=
|
||||
gitea.tecamino.com/paadi/tecamino-logger v1.0.0/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
|
||||
gitea.tecamino.com/paadi/tecamino-logger v1.0.1 h1:NCF/foyuf0wVKLkyy2y1FYvHo9pVaUuHc1GSU5bNVbc=
|
||||
gitea.tecamino.com/paadi/tecamino-logger v1.0.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
|
||||
|
||||
5
main.go
5
main.go
@@ -18,6 +18,8 @@ var staticFolder = "./web/static/"
|
||||
|
||||
func main() {
|
||||
|
||||
env.Load(".env")
|
||||
|
||||
logConfig := logging.DefaultConfig()
|
||||
logConfig.Debug = env.Env.GetValue() == "debug"
|
||||
|
||||
@@ -26,9 +28,6 @@ func main() {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
logger.Debug("main", "load enviroment variable")
|
||||
env.Load(".env")
|
||||
|
||||
r := mux.NewRouter()
|
||||
|
||||
uploadFolder := env.PhotoDir.GetValue()
|
||||
|
||||
Reference in New Issue
Block a user