itamae-plugin-recipe-nginx_build 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e722fe0602d40022384d75cedc85b8b9c784c259
-  data.tar.gz: 34bd61da05ae005644e18073f45598752179d530
+  metadata.gz: 2b04cdd5719b7dba6c55e696134518fefa1d2cb6
+  data.tar.gz: d30db3a2978703f22cef085e9feca0db4337823d
 SHA512:
-  metadata.gz: ee024e2d1b408f210f33c0a056de33644e3dcf08ea93455a5c65f2be651525d6c4aac2f7e93e2f7557ee2765fb79a8fc507cff94e3a11d053402d7b1690e2c2f
-  data.tar.gz: 4268c9935813e96abc5da7242050219e78b746ab3338b18ff411e03e3754f1d08d4dbf1d2ab61876aeaa52c3dbb39a02c6854793d9812a930067a4f2264a5701
+  metadata.gz: 70d287037ebf0af11abadd65e74ab4e809b0bca18c1755e129d2bd710f04c58c5a986d1ae2b3915aa19805274fdc78f76bc7909aaf83d60c9f1536eab6d778ff
+  data.tar.gz: 28228bce16acc3d78ffec8b00ecf1febbfb941716b75965ef71223fb154d4f399e0d4113523e7788734039e3b6ef30a30c6b0010cadadd28ac00515546ff7ea9

data/lib/itamae/plugin/recipe/nginx_build.rb

@@ -9,7 +9,13 @@ nginx_build_version = node[:nginx_build][:version] if node[:nginx_build] && node
 nginx_build_bin = "/usr/local/bin/"
 nginx_build_bin = node[:nginx_build][:bin] if node[:nginx_build] && node[:nginx_build][:bin]
 
-%w(pcre pcre-devel).each do |pkg|
+case node[:platform]
+when 'debian', 'ubuntu', 'mint'
+  packages = %w(libpcre3 libpcre3-dev)
+else
+  packages = %w(pcre pcre-devel)
+end
+packages.each do |pkg|
   package pkg
 end
 
@@ -23,4 +29,4 @@ mv nginx-build #{nginx_build_bin}
 EOS
   command nginx_build
   not_if "test -e #{nginx_build_bin}nginx-build"
-end
+end

data/lib/itamae/plugin/recipe/nginx_build/install.rb

@@ -74,11 +74,18 @@ execute "build-nginx" do
   action :nothing
 end
 
+case node[:platform]
+when 'debian', 'ubuntu', 'mint'
+  init_nginx_template_path = "./templates/init_nginx_debian.erb"
+else
+  init_nginx_template_path = "./templates/init_nginx.erb"
+end
+
 template "/etc/init.d/nginx" do
   owner "root"
   group "root"
   mode "755"
-  source "./templates/init_nginx.erb"
+  source init_nginx_template_path
   variables({
                 "nginx_sbin" => nginx_sbin,
                 "nginx_conf" => nginx_conf,

data/lib/itamae/plugin/recipe/nginx_build/templates/init_nginx_debian.erb

@@ -0,0 +1,207 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:	  nginx
+# Required-Start:    $local_fs $remote_fs $network $syslog $named
+# Required-Stop:     $local_fs $remote_fs $network $syslog $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts the nginx web server
+# Description:       starts nginx using start-stop-daemon
+# config:      <%=@nginx_conf%>
+# pidfile:     <%=@nginx_pid%>
+### END INIT INFO
+
+DAEMON="<%=@nginx_sbin%>"
+NAME=nginx
+DESC=nginx
+PID="<%=@nginx_pid%>"
+DAEMON_OPTS="-c <%=@nginx_conf%>"
+
+# Include nginx defaults if available
+if [ -r /etc/default/nginx ]; then
+	. /etc/default/nginx
+fi
+
+STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/5/KILL/5}"
+
+test -x $DAEMON || exit 0
+
+. /lib/init/vars.sh
+. /lib/lsb/init-functions
+
+# Check if the ULIMIT is set in /etc/default/nginx
+if [ -n "$ULIMIT" ]; then
+	# Set the ulimits
+	ulimit $ULIMIT
+fi
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON -- \
+		$DAEMON_OPTS 2>/dev/null \
+		|| return 2
+}
+
+test_nginx_config() {
+	$DAEMON -t $DAEMON_OPTS >/dev/null 2>&1
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PID --name $NAME
+	RETVAL="$?"
+
+	sleep 1
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	start-stop-daemon --stop --signal HUP --quiet --pidfile $PID --name $NAME
+	return 0
+}
+
+#
+# Rotate log files
+#
+do_rotate() {
+	start-stop-daemon --stop --signal USR1 --quiet --pidfile $PID --name $NAME
+	return 0
+}
+
+#
+# Online upgrade nginx executable
+#
+# "Upgrading Executable on the Fly"
+# http://nginx.org/en/docs/control.html
+#
+do_upgrade() {
+	# Return
+	#   0 if nginx has been successfully upgraded
+	#   1 if nginx is not running
+	#   2 if the pid files were not created on time
+	#   3 if the old master could not be killed
+	if start-stop-daemon --stop --signal USR2 --quiet --pidfile $PID --name $NAME; then
+		# Wait for both old and new master to write their pid file
+		while [ ! -s "${PID}.oldbin" ] || [ ! -s "${PID}" ]; do
+			cnt=`expr $cnt + 1`
+			if [ $cnt -gt 10 ]; then
+				return 2
+			fi
+			sleep 1
+		done
+		# Everything is ready, gracefully stop the old master
+		if start-stop-daemon --stop --signal QUIT --quiet --pidfile "${PID}.oldbin" --name $NAME; then
+			return 0
+		else
+			return 3
+		fi
+	else
+		return 1
+	fi
+}
+
+case "$1" in
+	start)
+		[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+		do_start
+		case "$?" in
+			0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+			2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		esac
+		;;
+	stop)
+		[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+		do_stop
+		case "$?" in
+			0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+			2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		esac
+		;;
+	restart)
+		log_daemon_msg "Restarting $DESC" "$NAME"
+
+		# Check configuration before stopping nginx
+		if ! test_nginx_config; then
+			log_end_msg 1 # Configuration error
+			exit 0
+		fi
+
+		do_stop
+		case "$?" in
+			0|1)
+				do_start
+				case "$?" in
+					0) log_end_msg 0 ;;
+					1) log_end_msg 1 ;; # Old process is still running
+					*) log_end_msg 1 ;; # Failed to start
+				esac
+				;;
+			*)
+				# Failed to stop
+				log_end_msg 1
+				;;
+		esac
+		;;
+	reload|force-reload)
+		log_daemon_msg "Reloading $DESC configuration" "$NAME"
+
+		# Check configuration before reload nginx
+		#
+		# This is not entirely correct since the on-disk nginx binary
+		# may differ from the in-memory one, but that's not common.
+		# We prefer to check the configuration and return an error
+		# to the administrator.
+		if ! test_nginx_config; then
+			log_end_msg 1 # Configuration error
+			exit 0
+		fi
+
+		do_reload
+		log_end_msg $?
+		;;
+	configtest|testconfig)
+		log_daemon_msg "Testing $DESC configuration"
+		test_nginx_config
+		log_end_msg $?
+		;;
+	status)
+		status_of_proc -p $PID "$DAEMON" "$NAME" && exit 0 || exit $?
+		;;
+	upgrade)
+		log_daemon_msg "Upgrading binary" "$NAME"
+		do_upgrade
+		log_end_msg 0
+		;;
+	rotate)
+		log_daemon_msg "Re-opening $DESC log files" "$NAME"
+		do_rotate
+		log_end_msg $?
+		;;
+	*)
+		echo "Usage: $NAME {start|stop|restart|reload|force-reload|status|configtest|rotate|upgrade}" >&2
+		exit 3
+		;;
+esac
+
+:

data/lib/itamae/plugin/recipe/nginx_build/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module NginxBuild
-        VERSION = "0.1.3"
+        VERSION = "0.1.4"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-nginx_build
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - zaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -86,6 +86,7 @@ files:
 - lib/itamae/plugin/recipe/nginx_build/install.rb
 - lib/itamae/plugin/recipe/nginx_build/templates/configure.sh.erb
 - lib/itamae/plugin/recipe/nginx_build/templates/init_nginx.erb
+- lib/itamae/plugin/recipe/nginx_build/templates/init_nginx_debian.erb
 - lib/itamae/plugin/recipe/nginx_build/templates/modules3rd.ini.erb
 - lib/itamae/plugin/recipe/nginx_build/version.rb
 homepage: https://github.com/zaru/itamae-plugin-recipe-nginx_build