diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/cherokee/cherokee')
3 files changed, 82 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch new file mode 100644 index 000000000..3336f7df7 --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 98a0f19df0a31d5649ad89d395fd1b8de5591827 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 3 Apr 2014 21:33:25 +0800 | ||
4 | Subject: [PATCH] admin/Makefile.am: only install configured.py once | ||
5 | |||
6 | Both the two rules install-adminpyDATA and install-generatedDATA will | ||
7 | install the configured.py to the same location, they can run parallel, | ||
8 | and they use "install -m", which would might build failures: | ||
9 | |||
10 | /usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory | ||
11 | |||
12 | This is because the first install is setting the permission while the | ||
13 | second install is removing the file an re-install. | ||
14 | |||
15 | Only install the configured.py once will fix the problem, I think that | ||
16 | there is no side effect since it installed the same file to the same | ||
17 | location twice in the past. | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
22 | --- | ||
23 | admin/Makefile.am | 1 - | ||
24 | 1 file changed, 1 deletion(-) | ||
25 | |||
26 | diff --git a/admin/Makefile.am b/admin/Makefile.am | ||
27 | index ce5937b..6f96934 100644 | ||
28 | --- a/admin/Makefile.am | ||
29 | +++ b/admin/Makefile.am | ||
30 | @@ -73,7 +73,6 @@ SystemStatsWidgets.py \ | ||
31 | Wizard.py \ | ||
32 | XMLServerDigest.py \ | ||
33 | config_version.py \ | ||
34 | -configured.py \ | ||
35 | consts.py \ | ||
36 | util.py \ | ||
37 | popen.py \ | ||
38 | -- | ||
39 | 1.8.2.1 | ||
40 | |||
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init new file mode 100644 index 000000000..93603b84d --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init | |||
@@ -0,0 +1,32 @@ | |||
1 | #!/bin/sh | ||
2 | DAEMON=/usr/sbin/cherokee | ||
3 | CONFIG=/etc/cherokee/cherokee.conf | ||
4 | PIDFILE=/var/run/cherokee.pid | ||
5 | NAME="cherokee" | ||
6 | DESC="Cherokee http server" | ||
7 | |||
8 | test -r /etc/default/cherokee && . /etc/default/cherokee | ||
9 | test -x "$DAEMON" || exit 0 | ||
10 | test ! -r "$CONFIG" && exit 0 | ||
11 | |||
12 | case "$1" in | ||
13 | start) | ||
14 | echo "Starting $DESC: " | ||
15 | start-stop-daemon --oknodo -S -x $DAEMON -- -d -C $CONFIG | ||
16 | ;; | ||
17 | |||
18 | stop) | ||
19 | echo "Stopping $DESC:" | ||
20 | start-stop-daemon -K -p $PIDFILE | ||
21 | ;; | ||
22 | |||
23 | restart) | ||
24 | $0 stop >/dev/null 2>&1 | ||
25 | $0 start | ||
26 | ;; | ||
27 | |||
28 | *) | ||
29 | echo "Usage: $0 {start|stop|restart}" | ||
30 | exit 0 | ||
31 | ;; | ||
32 | esac | ||
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service new file mode 100644 index 000000000..a2d703185 --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service | |||
@@ -0,0 +1,10 @@ | |||
1 | [Unit] | ||
2 | Description=Cherokee web server | ||
3 | After=syslog.target | ||
4 | |||
5 | [Service] | ||
6 | Type=forking | ||
7 | ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf | ||
8 | |||
9 | [Install] | ||
10 | WantedBy=multi-user.target | ||