@@ -1,15 +1,14 @@

 [Unit]

 Description=Consul Agent

-Wants=basic.target

-After=basic.target network.target

+Requires=network-online.target

+After=network-online.target

 [Service]

-EnvironmentFile=-/etc/default/consul

-ExecStart=/usr/bin/consul agent $OPTIONS -config-dir /etc/consul.d

-ExecReload=/bin/kill -HUP $MAINPID

+ExecStart=/usr/bin/consul agent -config-dir=/etc/consul.d -dev -advertise 127.0.0.1

+ExecReload=/usr/bin/kill -HUP $MAINPID

+KillSignal=SIGINT

 User=consul

 Group=consul

-KillSignal=SIGINT

 Restart=on-failure

 LimitNOFILE=131072

@@ -1,20 +1,27 @@

-Summary:	Consul-0.6.4

+Summary:	Consul-0.7.1

 Name:		consul

-Version:	0.6.4

+Version:	0.7.1

 Release:	1%{?dist}

 License:	Mozilla Public License, version 2.0

 URL:		https://www.consul.io/

-Group:		System Environment/Security

+Group:		System Environment/Daemons

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0: https://releases.hashicorp.com/%{name}/%{version}/%{name}_%{version}_linux_amd64.zip

-%define sha1 consul=85de555de27cae126f0f89e762f6136e1c7104b6

+%define sha1 %{name}_%{version}_linux_amd64.zip=c2be9eebc40bf552e260c7dd31a77cb60474712f

 Source1:	consul.service

 Requires:	shadow

 BuildRequires:  unzip

 %description

-Service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.

+Consul is a tool for service discovery and configuration. Consul is distributed, highly available, and extremely scalable.

+

+Consul provides several key features:

+ - Service Discovery - Consul makes it simple for services to register themselves and to discover other services via a DNS or HTTP interface. External services such as SaaS providers can be registered as well.

+ - Health Checking - Health Checking enables Consul to quickly alert operators about any issues in a cluster. The integration with service discovery prevents routing traffic to unhealthy hosts and enables service level circuit breakers.

+ - Key/Value Storage - A flexible key/value store enables storing dynamic configuration, feature flagging, coordination, leader election and more. The simple HTTP API makes it easy to use anywhere.

+ - Multi-Datacenter - Consul is built to be datacenter aware, and can support any number of regions without complex configuration.

+

 %prep -p exit

 %setup -qcn %{name}-%{version}

@@ -33,20 +40,19 @@ mv %{_builddir}/%{name}-%{version}/%{name} %{buildroot}%{_bindir}/

 cp %{SOURCE1} %{buildroot}/usr/lib/systemd/system

 install -vdm755 %{buildroot}/var/lib/consul

-%post	-p /sbin/ldconfig

-if [ $1 -eq 1 ]; then

-  # this is initial installation

-  if ! getent group %{name} >/dev/null; then

-      groupadd -g 850 %{name}

-  fi

-  if ! getent passwd %{name} >/dev/null; then

-      useradd -c "Consul Agent" -d /var/lib/%{name} -g %{name} \

-          -s /bin/false -u 850 %{name}

-  fi

+%pre

+if ! getent group %{name} >/dev/null; then

+    groupadd %{name}

+fi

+if ! getent passwd %{name} >/dev/null; then

+    useradd -c "Consul Agent" -d /var/lib/%{name} -g %{name} -s /bin/false %{name}

 fi

-%systemd_post consul.service

+exit 0

+

+%post

+%systemd_post %{name}.service

-%postun	-p /sbin/ldconfig

+%postun

 if [ $1 -eq 0 ]; then

   # this is delete operation

   if getent passwd %{name} >/dev/null; then

@@ -56,21 +62,24 @@ if [ $1 -eq 0 ]; then

       groupdel %{name}

   fi

 fi

-%systemd_postun_with_restart consul.service

+%systemd_postun_with_restart %{name}.service

 %preun

-%systemd_preun consul.service

+%systemd_preun %{name}.service

 %clean

-rm -rf %{buildroot}/*

+rm -rf %{buildroot}

 %files

-%defattr(-,consul,consul)

+%defattr(-,%{name},%{name})

 %{_bindir}/%{name}

 /usr/lib/systemd/system/%{name}.service

 %dir /var/lib/%{name}

 %dir %{_sysconfdir}/%{name}.d

 %changelog

+*	Sat Nov 12 2016 Ivan Porto Carrero <icarrero@vmware.com> 0.7.1-1

+-	Defaults to dev mode

+- Fix user and group creation

 *	Sun Jul 24 2016 Ivan Porto Carrero <icarrero@vmware.com> 0.6.4-1

 -	Initial build.	First version

new file mode 100644

@@ -0,0 +1,13 @@

+# https://www.nomadproject.io/docs/agent/config.html

+

+bind_addr = "0.0.0.0"

+data_dir = "/var/lib/nomad"

+

+leave_on_interrupt = true

+leave_on_terminate = true

+

+disable_update_check = true

+

+client {

+  servers = []

+}

new file mode 100644

@@ -0,0 +1,10 @@

+[Unit]

+Description=Nomad Client Agent

+Documentation=https://www.nomadproject.io/docs/agent/

+After=network.target

+

+[Service]

+ExecStart=/usr/bin/nomad agent -config /etc/nomad/client.conf -client

+

+[Install]

+WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,13 @@

+# https://www.nomadproject.io/docs/agent/config.html

+

+bind_addr = "127.0.0.1"

+data_dir = "/var/lib/nomad"

+

+leave_on_interrupt = true

+leave_on_terminate = true

+

+disable_update_check = true

+

+server {

+  bootstrap_expect = 1

+}

new file mode 100644

@@ -0,0 +1,10 @@

+[Unit]

+Description=Nomad Server Agent

+Documentation=https://www.nomadproject.io/docs/agent/

+After=network-online.target

+

+[Service]

+ExecStart=/usr/bin/nomad agent -config /etc/nomad/server.conf -server

+

+[Install]

+WantedBy=multi-user.target

deleted file mode 100644

@@ -1,22 +0,0 @@

-[Unit]

-Description=Nomad

-Documentation=https://nomadproject.io/docs/

-Wants=network-online.target

-After=network-online.target consul.service

-Requires=consul.service

-

-[Service]

-Type=notify

-User=root

-Group=root

-EnvironmentFile=-/etc/default/nomad

-ExecStart=/usr/bin/nomad agent $OPTIONS -config /etc/nomad.d

-LimitNOFILE=infinity

-LimitNPROC=infinity

-LimitCORE=infinity

-TasksMax=infinity

-KillSignal=SIGINT

-Restart=on-abnormal

-

-[Install]

-WantedBy=multi-user.target

@@ -1,6 +1,6 @@

-Summary:	Nomad Scheduler 0.4.0

+Summary:	Nomad Scheduler 0.4.1

 Name:		nomad

-Version:	0.4.0

+Version:	0.4.1

 Release:	1%{?dist}

 License:	Mozilla Public License, version 2.0

 URL:		https://www.nomadproject.io/

@@ -8,8 +8,11 @@ Group:		System Environment/Security

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0: https://releases.hashicorp.com/%{name}/%{version}/%{name}_%{version}_linux_amd64.zip

-%define sha1 nomad=62685976dc86b3d2c89b529ade8e4d83be4d80fa

-Source1:	%{name}.service

+%define sha1 %{name}_%{version}_linux_amd64.zip=33ebb18daf38621e1c5e1d5e98b5eb9dbc3446c9

+Source1:	%{name}-client.conf

+Source2:	%{name}-client.service

+Source3:	%{name}-server.conf

+Source4:	%{name}-server.service

 Requires:	shadow

 BuildRequires:  unzip

@@ -30,28 +33,35 @@ chown -R root:root %{buildroot}%{_bindir}

 mv %{_builddir}/%{name}-%{version}/%{name} %{buildroot}%{_bindir}/

-cp %{SOURCE1} %{buildroot}/usr/lib/systemd/system

+cp %{SOURCE2} %{buildroot}/usr/lib/systemd/system

+cp %{SOURCE4} %{buildroot}/usr/lib/systemd/system

 install -vdm755 %{buildroot}/var/lib/%{name}

-%post	-p /sbin/ldconfig

-%systemd_post %{name}.service

+%post

+%systemd_post %{name}-client.service

+%systemd_post %{name}-server.service

-%postun	-p /sbin/ldconfig

-%systemd_postun_with_restart %{name}.service

+%postun

+%systemd_postun_with_restart %{name}-client.service

+%systemd_postun_with_restart %{name}-server.service

 %preun

-%systemd_preun %{name}.service

+%systemd_preun %{name}-client.service

+%systemd_preun %{name}-server.service

 %clean

-rm -rf %{buildroot}/*

+rm -rf %{buildroot}

 %files

-%defattr(-,%{name},%{name})

+%defattr(-,root,root)

 %{_bindir}/%{name}

-/usr/lib/systemd/system/%{name}.service

+/usr/lib/systemd/system/%{name}-client.service

+/usr/lib/systemd/system/%{name}-server.service

 %dir /var/lib/%{name}

 %dir %{_sysconfdir}/%{name}.d

 %changelog

+*	Sat Nov 12 2016 Ivan Porto Carrero <icarrero@vmware.com> 0.4.1-1

+-	Defaults to dev mode

 *	Sun Jul 24 2016 Ivan Porto Carrero <icarrero@vmware.com> 0.4.0-1

 -	Initial build.	First version