Browse Source

upgrading package: acmetool 20160203 -> 20160204

Ralf S. Engelschall 9 years ago
parent
commit
b09ee4b47f
2 changed files with 33 additions and 8 deletions
  1. 20 0
      acmetool/acmetool-hook.sh
  2. 13 8
      acmetool/acmetool.spec

+ 20 - 0
acmetool/acmetool-hook.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+##
+##  acmetool-hook.sh -- ACMETool hook for live-updates
+##
+
+EVENT_NAME="$1"
+shift
+
+if [ ".$EVENT_NAME" = ".live-updated" ]; then
+    #   reload Apache, if present
+    if [ -x @l_prefix@/sbin/apache ]; then
+        @l_prefix@/bin/openpkg rc apache reload
+    fi
+
+    #   reload NGINX, if present
+    if [ -x @l_prefix@/sbin/nginx ]; then
+        @l_prefix@/bin/openpkg rc nginx reload
+    fi
+fi
+

+ 13 - 8
acmetool/acmetool.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package information
-%define       V_acmetool_base  20160203
-%define       V_acmetool_snap  20160203
+%define       V_acmetool_base  20160204
+%define       V_acmetool_snap  20160204
 
 #   package information
 Name:         acmetool
@@ -42,11 +42,12 @@ Release:      20160204
 Source0:      http://download.openpkg.org/components/versioned/acmetool/acmetool-%{V_acmetool_snap}.tar.xz
 Source1:      acmetool-apache.conf
 Source2:      acmetool-responses.yaml
-Source3:      rc.acmetool
+Source3:      acmetool-hook.sh
+Source4:      rc.acmetool
 
 #   build information
-BuildPreReq:  OpenPKG, openpkg >= 20140101, go
-PreReq:       OpenPKG, openpkg >= 20140101
+BuildPreReq:  OpenPKG, openpkg >= 20160101, go
+PreReq:       OpenPKG, openpkg >= 20160101
 
 %description
     ACMETool is an easy-to-use command line tool for automatically
@@ -70,7 +71,7 @@ PreReq:       OpenPKG, openpkg >= 20140101
     export GOPATH=`pwd`
     cd $GOPATH/src/github.com/hlandau/acme
     go build -x \
-        -ldflags "-X github.com/hlandau/acme/hooks.DefaultPath=%{l_prefix}/var/acmetool/hook \
+        -ldflags "-X github.com/hlandau/acme/hooks.DefaultPath=%{l_prefix}/libexec/acmetool \
                   -X github.com/hlandau/acme/storage.RecommendedPath=%{l_prefix}/var/acmetool/state \
                   -X github.com/hlandau/acme/responder.StandardWebrootPath=%{l_prefix}/var/acmetool/root \
                   -X github.com/hlandau/degoutils/buildinfo.RawBuildInfo=XX" \
@@ -89,8 +90,7 @@ PreReq:       OpenPKG, openpkg >= 20140101
         $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/acmetool \
         $RPM_BUILD_ROOT%{l_prefix}/var/acmetool/hook \
-        $RPM_BUILD_ROOT%{l_prefix}/var/acmetool/state \
-        $RPM_BUILD_ROOT%{l_prefix}/var/acmetool/root
+        $RPM_BUILD_ROOT%{l_prefix}/var/acmetool/state
 
     #   install program
     %{l_shtool} install -c -s -m 755 \
@@ -102,6 +102,11 @@ PreReq:       OpenPKG, openpkg >= 20140101
         %{SOURCE acmetool-responses.yaml} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/acmetool/responses.yaml
 
+    #   install hook script
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
+        %{SOURCE acmetool-hook.sh} \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/acmetool/life-updated
+
     #   install Apache config
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         %{SOURCE acmetool-apache.conf} \