Browse code
Bug 1883453: disable etcd,zookeeper, httpd by default
Change-Id: I5ad02de72a797121428676134c505c7773b95a22
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2825
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
harishspqr authored on 2017/06/01 03:37:11Showing 3 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Etcd-3.1.5 |
| 2 | 2 |
Name: etcd |
| 3 | 3 |
Version: 3.1.5 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: Apache License |
| 6 | 6 |
URL: https://github.com/coreos/etcd |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -36,6 +36,9 @@ mv %{_builddir}/%{name}-%{version}/README.md %{buildroot}/%{_docdir}/%{name}-%{v
|
| 36 | 36 |
mv %{_builddir}/%{name}-%{version}/etcdctl/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README-etcdctl.md
|
| 37 | 37 |
mv %{_builddir}/%{name}-%{version}/etcdctl/READMEv2.md %{buildroot}/%{_docdir}/%{name}-%{version}/READMEv2-etcdctl.md
|
| 38 | 38 |
|
| 39 |
+install -vdm755 %{buildroot}/lib/systemd/system-preset
|
|
| 40 |
+echo "disable etcd.service" > %{buildroot}/lib/systemd/system-preset/50-etcd.preset
|
|
| 41 |
+ |
|
| 39 | 42 |
cp %{SOURCE1} %{buildroot}/lib/systemd/system
|
| 40 | 43 |
install -vdm755 %{buildroot}/var/lib/etcd
|
| 41 | 44 |
|
| ... | ... |
@@ -50,9 +53,12 @@ rm -rf %{buildroot}/*
|
| 50 | 50 |
%{_bindir}/etcd*
|
| 51 | 51 |
/%{_docdir}/%{name}-%{version}/*
|
| 52 | 52 |
/lib/systemd/system/etcd.service |
| 53 |
+/lib/systemd/system-preset/50-etcd.preset |
|
| 53 | 54 |
%dir /var/lib/etcd |
| 54 | 55 |
|
| 55 | 56 |
%changelog |
| 57 |
+* Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.1.5-2 |
|
| 58 |
+- Provide preset file to disable service by default |
|
| 56 | 59 |
* Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 3.1.5-1 |
| 57 | 60 |
- Upgraded to version 3.1.5, build from sources |
| 58 | 61 |
* Fri Sep 2 2016 Xiaolin Li <xiaolinl@vmware.com> 3.0.9-1 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache HTTP Server |
| 2 | 2 |
Name: httpd |
| 3 | 3 |
Version: 2.4.25 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: http://httpd.apache.org/ |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -94,6 +94,10 @@ ExecReload=/usr/sbin/httpd -k graceful |
| 94 | 94 |
WantedBy=multi-user.target |
| 95 | 95 |
|
| 96 | 96 |
EOF |
| 97 |
+ |
|
| 98 |
+install -vdm755 %{buildroot}/usr/lib/systemd/system-preset
|
|
| 99 |
+echo "disable httpd.service" > %{buildroot}/usr/lib/systemd/system-preset/50-httpd.preset
|
|
| 100 |
+ |
|
| 97 | 101 |
ln -s /usr/sbin/httpd %{buildroot}/usr/sbin/apache2
|
| 98 | 102 |
ln -s /etc/httpd/conf/httpd.conf %{buildroot}/etc/httpd/httpd.conf
|
| 99 | 103 |
|
| ... | ... |
@@ -167,6 +171,7 @@ fi |
| 167 | 167 |
%{_sysconfdir}/httpd/httpd.conf
|
| 168 | 168 |
%dir %{_sysconfdir}/httpd/logs
|
| 169 | 169 |
%{_libdir}/systemd/system/httpd.service
|
| 170 |
+%{_libdir}/systemd/system-preset/50-httpd.preset
|
|
| 170 | 171 |
|
| 171 | 172 |
%files tools |
| 172 | 173 |
%defattr(-,root,root) |
| ... | ... |
@@ -174,6 +179,8 @@ fi |
| 174 | 174 |
%{_bindir}/dbmmanage
|
| 175 | 175 |
|
| 176 | 176 |
%changelog |
| 177 |
+* Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.4.25-3 |
|
| 178 |
+- Provide preset file to disable service by default. |
|
| 177 | 179 |
* Fri Mar 31 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.4.25-2 |
| 178 | 180 |
- Fixing httpd.pid file write issue |
| 179 | 181 |
* Fri Mar 31 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.4.25-1 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Highly reliable distributed coordination |
| 2 | 2 |
Name: zookeeper |
| 3 | 3 |
Version: 3.4.10 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
URL: http://zookeeper.apache.org/ |
| 6 | 6 |
License: Apache License, Version 2.0 |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -52,6 +52,10 @@ popd |
| 52 | 52 |
mkdir -p %{buildroot}/lib/systemd/system
|
| 53 | 53 |
cp %{SOURCE1} %{buildroot}/lib/systemd/system/zookeeper.service
|
| 54 | 54 |
cp %{SOURCE2} %{buildroot}%{_bindir}/zkEnv.sh
|
| 55 |
+ |
|
| 56 |
+install -vdm755 %{buildroot}/lib/systemd/system-preset
|
|
| 57 |
+echo "disable zookeeper.service" > %{buildroot}/lib/systemd/system-preset/50-zookeeper.preset
|
|
| 58 |
+ |
|
| 55 | 59 |
%pre |
| 56 | 60 |
getent group hadoop >/dev/null || /usr/sbin/groupadd -r hadoop |
| 57 | 61 |
getent passwd zookeeper >/dev/null || /usr/sbin/useradd --comment "ZooKeeper" --shell /bin/bash -M -r --groups hadoop --home %{_prefix}/share/zookeeper zookeeper
|
| ... | ... |
@@ -98,9 +102,12 @@ fi |
| 98 | 98 |
%attr(0775,zookeeper,hadoop) /sbin/update-zookeeper-env.sh |
| 99 | 99 |
%config(noreplace) %{_sysconfdir}/zookeeper/*
|
| 100 | 100 |
/lib/systemd/system/zookeeper.service |
| 101 |
+/lib/systemd/system-preset/50-zookeeper.preset |
|
| 101 | 102 |
%{_prefix}
|
| 102 | 103 |
|
| 103 | 104 |
%changelog |
| 105 |
+* Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.4.10-3 |
|
| 106 |
+- Provide preset to disable service by default |
|
| 104 | 107 |
* Wed May 24 2017 Xiaolin Li <xiaolinl@vmware.com> 3.4.10-2 |
| 105 | 108 |
- Used RuntimeDirectory to create folder /var/run/zookeeper. |
| 106 | 109 |
* Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 3.4.10-1 |