update service files

compose-files/gitea.yml

@@ -1,30 +0,0 @@
-version: "3"
-
-volumes:
-  gitea-data:
-    driver: local
-  gitea-ssh:
-    driver: local
-
-services:
-  server:
-    container_name: gitea
-    image: gitea/gitea:1
-    restart: always
-    volumes:
-        #- gitea-data:/var/lib/gitea:Z
-        #- gitea-config:/etc/gitea:Z
-      - gitea-data:/data:Z
-      - gitea-ssh:/data/git/.ssh:Z
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - DISABLE_SSH=false
-      - START_SSH_SERVER=true
-      - SSH_PORT=2222
-      - SSH_LISTEN_PORT=2222
-    ports:
-      - "3000:3000"
-      - "2222:2222"

compose-files/jbmasto.yml

@@ -1,6 +0,0 @@
-version: 3.8
-services:
-  tooter:
-    container_name: jbmasto
-    build: /home/oct2pus/server-config/docker-files/jbmasto
-    volume:

compose-files/megacmd.yml

@@ -1,3 +0,0 @@
-services:
-  mega:
-    image: 

compose-files/podgrab.yml

@@ -1,21 +0,0 @@
-version: "2.1"
-
-volumes:
-  podgrab-config:
-    driver: local
-  podgrab-data:
-    driver: local
-
-services:
-  podgrab:
-    image: akhilrex/podgrab
-    container_name: podgrab
-    environment:
-      - CHECK_FREQUENCY=240
-     # - PASSWORD=password     ## Uncomment to enable basic authentication, username = podgrab
-    volumes:
-      - podgrab-config:/config
-      - podgrab-data:/assets
-    ports:
-      - 8080:8080
-    restart: unless-stopped

compose-files/sharry.yml

@@ -1,14 +0,0 @@
-version: '3.7'
-volumes:
-  sharry-data:
-    driver: local
-
-services:
-  restserver:
-    image: eikek0/sharry:latest
-    container_name: sharry
-    command: /data/sharry.conf
-    ports:
-      - "9090:9090"
-    volumes:
-      - sharry-data:/data/

post.fish

@@ -1,9 +0,0 @@
-#!/usr/bin/fish
-
-for i in (ls compose-files)
-	cp compose-files/$i ~/.config/compose/
-end
-
-for i in (ls service-files)
-	cp service-files/$i ~/.config/systemd/user/
-end

service-files/gitea.service

@@ -1,20 +1,18 @@
 [Unit]
 Description=gitea.service
-Wants=network.target
+Wants=network-online.target
-After=network-online.target
+After=NetworkManager.service network.target network-online.target
 RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 
 # %E is "the XDG_CONFIG path"
-
+# docker run --name gitea --restart always -v gitea-data:/data:Z -v gitea-ssh:/data/git/.ssh:Z -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro -e USER_UID=1000 -e USER_GID=1000 -e DISABLE_SSH=false -e START_SSH_SERVER=true -e SSH_PORT=2222 -e SSH_LISTEN_PORT=2222 -p 3000:3000 -p 2222:2222 gitea/gitea:1.21
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-#ExecStartPre=/bin/rm -f %t/container-gitea.pid %t/container-gitea.ctr-id
+ExecStart=/usr/bin/podman run -d --name gitea --restart always -v gitea-data:/data:Z -v gitea-ssh:/data/git/.ssh:Z -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro -e USER_UID=1000 -e USER_GID=1000 -e DISABLE_SSH=false -e START_SSH_SERVER=true -e SSH_PORT=2222 -e SSH_LISTEN_PORT=2222 -p 3000:3000 -p 2222:2222 gitea/gitea:1.21
-ExecStart=/usr/bin/podman-compose -f %E/compose/gitea.yml up -d
+ExecStop=/usr/bin/podman stop gitea
-ExecStop=/usr/bin/podman-compose -f %E/compose/gitea.yml down
 ExecStopPost=/usr/bin/podman rm gitea
-#PIDFile=%t/container-gitea.pid
 Type=oneshot
 RemainAfterExit=yes
 

service-files/podgrab.service

@@ -1,20 +1,22 @@
 [Unit]
 Description=podgrab.service
-Wants=network.target
+Wants=network-online.target
-After=network-online.target
+After=NetworkManager.service network.target network-online.target
 RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 
 # %E is "the XDG_CONFIG path"
 
+#docker run --name podgrab -e CHECK_FREQUENCY=240 -v podgrab-config:/config -v podgrab-data:/assets -p 8080:8080 --restart unless-stopped akhilrex/podgrab
+
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-ExecStart=/usr/bin/podman-compose -f %E/compose/podgrab.yml up -d
+ExecStart=/usr/bin/podman run -d --name=podgrab -e CHECK_FREQUENCY=240 -v podgrab-config:/config -v podgrab-data:/assets -p 8080:8080 --restart always akhilrex/podgrab
-ExecStop=/usr/bin/podman-compose -f %E/compose/podgrab.yml down
+ExecStop=/usr/bin/podman stop podgrab
 ExecStopPost=/usr/bin/podman rm podgrab
 Type=oneshot
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target default.target
+WantedBy=default.target

service-files/sharry.service

@@ -1,20 +1,22 @@
 [Unit]
 Description=sharry.service
-Wants=network.target
+Wants=network-online.target
-After=network-online.target
+After=NetworkManager.service network.target network-online.target
 RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 
 # %E is "the XDG_CONFIG path"
 
+# docker run --name sharry -p 9090:9090 -v sharry-data:/data/ eikek0/sharry:latest /data/sharry.conf
+
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-ExecStart=/usr/bin/podman-compose -f %E/compose/sharry.yml up -d
+ExecStart=/usr/bin/podman run -d --name=sharry -p 9090:9090 -v sharry-data:/data eikek0/sharry:latest /data/sharry.conf
-ExecStop=/usr/bin/podman-compose -f %E/compose/sharry.yml down
+ExecStop=/usr/bin/podman stop sharry
 ExecStopPost=/usr/bin/podman rm sharry
 Type=oneshot
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target default.target
+WantedBy=default.target