From 20c4ab362487989b88c29981232b6e78fe793f7f Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 21 Jul 2026 11:21:12 +0200 Subject: Replace server-git service with a similar application-haskell --- README.md | 7 ++++--- applications/application-haskell-log/consumer-for | 1 + applications/application-haskell-log/dependencies | 4 ++++ applications/application-haskell-log/notification-fd | 1 + applications/application-haskell-log/pipeline-name | 1 + applications/application-haskell-log/run | 5 +++++ applications/application-haskell-log/type | 1 + applications/application-haskell-srv/dependencies | 2 ++ applications/application-haskell-srv/producer-for | 1 + applications/application-haskell-srv/run | 6 ++++++ applications/application-haskell-srv/type | 1 + server/server-git-log/consumer-for | 1 - server/server-git-log/dependencies | 4 ---- server/server-git-log/notification-fd | 1 - server/server-git-log/pipeline-name | 1 - server/server-git-log/run | 5 ----- server/server-git-log/type | 1 - server/server-git-srv/dependencies | 2 -- server/server-git-srv/env/GITEA_WORK_DIR | 1 - server/server-git-srv/env/HOME | 1 - server/server-git-srv/producer-for | 1 - server/server-git-srv/run | 6 ------ server/server-git-srv/type | 1 - 23 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 applications/application-haskell-log/consumer-for create mode 100644 applications/application-haskell-log/dependencies create mode 100644 applications/application-haskell-log/notification-fd create mode 100644 applications/application-haskell-log/pipeline-name create mode 100644 applications/application-haskell-log/run create mode 100644 applications/application-haskell-log/type create mode 100644 applications/application-haskell-srv/dependencies create mode 100644 applications/application-haskell-srv/producer-for create mode 100644 applications/application-haskell-srv/run create mode 100644 applications/application-haskell-srv/type delete mode 100644 server/server-git-log/consumer-for delete mode 100644 server/server-git-log/dependencies delete mode 100644 server/server-git-log/notification-fd delete mode 100644 server/server-git-log/pipeline-name delete mode 100644 server/server-git-log/run delete mode 100644 server/server-git-log/type delete mode 100644 server/server-git-srv/dependencies delete mode 100644 server/server-git-srv/env/GITEA_WORK_DIR delete mode 100644 server/server-git-srv/env/HOME delete mode 100644 server/server-git-srv/producer-for delete mode 100644 server/server-git-srv/run delete mode 100644 server/server-git-srv/type diff --git a/README.md b/README.md index 8ba4852..7d8e51b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ Some s6 service definitions for third-party software on Slackware Linux. -## application +## applications -This directory contains an example of a Ruby on Rails service running on -the default Puma server. +This directory contains examples of how to run applications. There is a Ruby on +Rails service running on the default Puma server, and a Haskell application +(which can actually be any compiled language, because it simply runs a binary). ## busybox diff --git a/applications/application-haskell-log/consumer-for b/applications/application-haskell-log/consumer-for new file mode 100644 index 0000000..634af72 --- /dev/null +++ b/applications/application-haskell-log/consumer-for @@ -0,0 +1 @@ +application-haskell-srv diff --git a/applications/application-haskell-log/dependencies b/applications/application-haskell-log/dependencies new file mode 100644 index 0000000..dc2488d --- /dev/null +++ b/applications/application-haskell-log/dependencies @@ -0,0 +1,4 @@ +# Comment out remount-root and uncomment local-fs +# if you use separate partition for /var/log +remount-root +#local-fs diff --git a/applications/application-haskell-log/notification-fd b/applications/application-haskell-log/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/applications/application-haskell-log/notification-fd @@ -0,0 +1 @@ +3 diff --git a/applications/application-haskell-log/pipeline-name b/applications/application-haskell-log/pipeline-name new file mode 100644 index 0000000..f2e9633 --- /dev/null +++ b/applications/application-haskell-log/pipeline-name @@ -0,0 +1 @@ +application-haskell diff --git a/applications/application-haskell-log/run b/applications/application-haskell-log/run new file mode 100644 index 0000000..3b82058 --- /dev/null +++ b/applications/application-haskell-log/run @@ -0,0 +1,5 @@ +#!/bin/execlineb -P + +s6-setuidgid application +exec -c +s6-log -d3 -- T /srv/httpd/application/haskell/log diff --git a/applications/application-haskell-log/type b/applications/application-haskell-log/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/applications/application-haskell-log/type @@ -0,0 +1 @@ +longrun diff --git a/applications/application-haskell-srv/dependencies b/applications/application-haskell-srv/dependencies new file mode 100644 index 0000000..ae0ae20 --- /dev/null +++ b/applications/application-haskell-srv/dependencies @@ -0,0 +1,2 @@ +postgresql +redis-instances diff --git a/applications/application-haskell-srv/producer-for b/applications/application-haskell-srv/producer-for new file mode 100644 index 0000000..bc62879 --- /dev/null +++ b/applications/application-haskell-srv/producer-for @@ -0,0 +1 @@ +application-haskell-log diff --git a/applications/application-haskell-srv/run b/applications/application-haskell-srv/run new file mode 100644 index 0000000..0cbb0b1 --- /dev/null +++ b/applications/application-haskell-srv/run @@ -0,0 +1,6 @@ +#!/bin/execlineb -P + +fdmove -c 2 1 +s6-setuidgid application +cd /srv/httpd/application/haskell +./bin/application serve diff --git a/applications/application-haskell-srv/type b/applications/application-haskell-srv/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/applications/application-haskell-srv/type @@ -0,0 +1 @@ +longrun diff --git a/server/server-git-log/consumer-for b/server/server-git-log/consumer-for deleted file mode 100644 index 8511fb6..0000000 --- a/server/server-git-log/consumer-for +++ /dev/null @@ -1 +0,0 @@ -server-git-srv diff --git a/server/server-git-log/dependencies b/server/server-git-log/dependencies deleted file mode 100644 index dc2488d..0000000 --- a/server/server-git-log/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# Comment out remount-root and uncomment local-fs -# if you use separate partition for /var/log -remount-root -#local-fs diff --git a/server/server-git-log/notification-fd b/server/server-git-log/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/server/server-git-log/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/server/server-git-log/pipeline-name b/server/server-git-log/pipeline-name deleted file mode 100644 index ff8edc9..0000000 --- a/server/server-git-log/pipeline-name +++ /dev/null @@ -1 +0,0 @@ -server-git diff --git a/server/server-git-log/run b/server/server-git-log/run deleted file mode 100644 index 938ae23..0000000 --- a/server/server-git-log/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P - -s6-setuidgid git -exec -c -s6-log -d3 -- T /srv/httpd/server/git/log diff --git a/server/server-git-log/type b/server/server-git-log/type deleted file mode 100644 index 5883cff..0000000 --- a/server/server-git-log/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/server/server-git-srv/dependencies b/server/server-git-srv/dependencies deleted file mode 100644 index ae0ae20..0000000 --- a/server/server-git-srv/dependencies +++ /dev/null @@ -1,2 +0,0 @@ -postgresql -redis-instances diff --git a/server/server-git-srv/env/GITEA_WORK_DIR b/server/server-git-srv/env/GITEA_WORK_DIR deleted file mode 100644 index 7e6be61..0000000 --- a/server/server-git-srv/env/GITEA_WORK_DIR +++ /dev/null @@ -1 +0,0 @@ -/srv/httpd/server/git/ diff --git a/server/server-git-srv/env/HOME b/server/server-git-srv/env/HOME deleted file mode 100644 index f9fc8e3..0000000 --- a/server/server-git-srv/env/HOME +++ /dev/null @@ -1 +0,0 @@ -/srv/git diff --git a/server/server-git-srv/producer-for b/server/server-git-srv/producer-for deleted file mode 100644 index 9524b53..0000000 --- a/server/server-git-srv/producer-for +++ /dev/null @@ -1 +0,0 @@ -server-git-log diff --git a/server/server-git-srv/run b/server/server-git-srv/run deleted file mode 100644 index 29d368e..0000000 --- a/server/server-git-srv/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/execlineb -P - -fdmove -c 2 1 -s6-setuidgid git -s6-envdir env -/srv/httpd/server/git/bin/gitea web --config /srv/httpd/server/git/etc/app.ini -p 3001 diff --git a/server/server-git-srv/type b/server/server-git-srv/type deleted file mode 100644 index 5883cff..0000000 --- a/server/server-git-srv/type +++ /dev/null @@ -1 +0,0 @@ -longrun -- cgit v1.2.3