Browse code
Add custom service options for httpd in ostree scenario
Change-Id: I78a7572d2ea911126be12a800f58dfd07c3c620e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1923
Reviewed-by: Danut Moraru <dmoraru@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
suezzelur authored on 2017/01/07 01:41:28Showing 3 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,8 @@ |
| 0 |
+[Service] |
|
| 1 |
+ExecStart= |
|
| 2 |
+ExecStart=/usr/sbin/httpd -f /srv/rpm-ostree/ostree-httpd.conf -DFORGROUND |
|
| 3 |
+ExecReload= |
|
| 4 |
+ExecReload=/usr/sbin/httpd -f /srv/rpm-ostree/ostree-httpd.conf -k graceful |
|
| 5 |
+KillSignal=SIGWINCH |
|
| 6 |
+KillMode=mixed |
|
| 7 |
+Restart=always |
| 0 | 8 |
deleted file mode 100644 |
| ... | ... |
@@ -1,14 +0,0 @@ |
| 1 |
-[Unit] |
|
| 2 |
-Description=The Apache HTTP Server |
|
| 3 |
-After=network.target remote-fs.target nss-lookup.target |
|
| 4 |
- |
|
| 5 |
-[Service] |
|
| 6 |
-Type=forking |
|
| 7 |
-ExecStart=/usr/sbin/httpd -f /srv/rpm-ostree/ostree-httpd.conf -DFORGROUND |
|
| 8 |
-ExecReload=/usr/sbin/httpd -f /srv/rpm-ostree/ostree-httpd.conf -k graceful |
|
| 9 |
-KillSignal=SIGWINCH |
|
| 10 |
-KillMode=mixed |
|
| 11 |
-Restart=always |
|
| 12 |
- |
|
| 13 |
-[Install] |
|
| 14 |
-WantedBy=multi-user.target |
| ... | ... |
@@ -41,7 +41,9 @@ class OstreeServerInstaller(Installer): |
| 41 | 41 |
self.run("ln -s /etc/yum.repos.d/photon-extras.repo {}/srv/rpm-ostree/photon-extras-ostree.repo".format(self.photon_root))
|
| 42 | 42 |
self.run("ln -s /etc/yum.repos.d/lightwave.repo {}/srv/rpm-ostree/lightwave-ostree.repo".format(self.photon_root))
|
| 43 | 43 |
self.run("cp ./ostree-httpd.conf {}/srv/rpm-ostree/".format(self.photon_root))
|
| 44 |
- self.run("cp ./httpd.service {}/usr/lib/systemd/system/".format(self.photon_root))
|
|
| 44 |
+ # Use a custom httpd service file for ostree server |
|
| 45 |
+ self.run("mkdir {}/etc/systemd/system/httpd.service.d".format(self.photon_root))
|
|
| 46 |
+ self.run("cp ./10-httpd-service.conf {}/etc/systemd/system/httpd.service.d/".format(self.photon_root))
|
|
| 45 | 47 |
self.run("cp ./get-ip-address.sh {}/usr/bin/".format(self.photon_root))
|
| 46 | 48 |
self.run("cp ./ostree-server-greeting.txt {}/etc/issue".format(self.photon_root))
|
| 47 | 49 |
self.run("ln -s /usr/lib/systemd/system/httpd.service {}/usr/lib/systemd/system/multi-user.target.wants/httpd.service".format(self.photon_root))
|