diff options
18 files changed, 18 insertions, 19 deletions
@@ -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/server/server-git-log/dependencies b/applications/application-haskell-log/dependencies index dc2488d..dc2488d 100644 --- a/server/server-git-log/dependencies +++ b/applications/application-haskell-log/dependencies diff --git a/server/server-git-log/notification-fd b/applications/application-haskell-log/notification-fd index 00750ed..00750ed 100644 --- a/server/server-git-log/notification-fd +++ b/applications/application-haskell-log/notification-fd 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/server/server-git-log/type b/applications/application-haskell-log/type index 5883cff..5883cff 100644 --- a/server/server-git-log/type +++ b/applications/application-haskell-log/type diff --git a/server/server-git-srv/dependencies b/applications/application-haskell-srv/dependencies index ae0ae20..ae0ae20 100644 --- a/server/server-git-srv/dependencies +++ b/applications/application-haskell-srv/dependencies 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/server/server-git-srv/type b/applications/application-haskell-srv/type index 5883cff..5883cff 100644 --- a/server/server-git-srv/type +++ b/applications/application-haskell-srv/type 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/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-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 |