From 5f7dd7211b1a21966dfb5b280a66d856bcbb1f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adnan=20Hajdarevi=C4=87?= Date: Fri, 30 Oct 2015 17:22:38 +0100 Subject: [PATCH] Revert "adding rpm spec file and sysv init script" --- .travis.yml | 30 ----- Makefile | 9 -- README.md | 2 +- golang-github-adnanh-webhook.spec | 186 ------------------------------ webhook.init | 111 ------------------ 5 files changed, 1 insertion(+), 337 deletions(-) delete mode 100644 .travis.yml delete mode 100644 golang-github-adnanh-webhook.spec delete mode 100644 webhook.init diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9bc507a5fa7..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -branches: - only: - - master -notifications: - email: - on_success: never - on_failure: always -sudo: required -services: -- docker -before_install: -- echo "deb http://us.archive.ubuntu.com/ubuntu trusty main universe" | sudo tee -a /etc/apt/sources.list -- sudo apt-get update -- docker pull fedora:22 -before_script: -- docker run -i --privileged -d -v $HOME/build/$TRAVIS_REPO_SLUG:$HOME/build/$TRAVIS_REPO_SLUG --name test_fedora fedora:22 bash -- docker exec -i test_fedora bash -c "dnf install -y rpmdevtools make mock git python-pip" -- docker exec -i test_fedora bash -c "dnf install -y go-compilers-golang-compiler" -- docker exec -i test_fedora bash -c "dnf install -y https://kojipkgs.fedoraproject.org//packages/golang-github-go-fsnotify-fsnotify/1.2.0/0.1.git96c060f.fc22/noarch/golang-github-go-fsnotify-fsnotify-devel-1.2.0-0.1.git96c060f.fc22.noarch.rpm" -- docker exec -i test_fedora bash -c "dnf install -y https://kojipkgs.fedoraproject.org//packages/golang-github-codegangsta-negroni/0.1/1.gitc7477ad.fc22/noarch/golang-github-codegangsta-negroni-devel-0.1-1.gitc7477ad.fc22.noarch.rpm" -- docker exec -i test_fedora bash -c "dnf install -y https://kojipkgs.fedoraproject.org//packages/golang-github-gorilla-mux/0/0.18.git8096f47.fc22/noarch/golang-github-gorilla-mux-devel-0-0.18.git8096f47.fc22.noarch.rpm" -- docker exec -i test_fedora bash -c "useradd -g root fedora; usermod -a -G mock fedora" -- docker exec -i test_fedora bash -c "pip install git+https://github.com/shawnsi/docker-rpmbuild" -script: -- docker exec -i test_fedora bash -c "pip install git+https://github.com/shawnsi/docker-rpmbuild" -- docker exec -u fedora -i test_fedora bash -c "cd $HOME/build/$TRAVIS_REPO_SLUG ; make build_rpm" - - - - diff --git a/Makefile b/Makefile index 3ac7fefa0a0..232c7a604dd 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,5 @@ DOCKER_IMAGE_NAME=adnanh/webhook CONTAINER_NAME=webhook -COMMIT := $(shell git rev-parse HEAD) -SHORTCOMMIT := $(shell git rev-parse HEAD|cut -c-7) -TEMPDIR := $(shell mktemp -d) - docker-build: Dockerfile docker build --force-rm=true --tag=${DOCKER_IMAGE_NAME} . @@ -12,8 +8,3 @@ docker-run: @echo "Here's an example command on how to run a webhook container:" @echo "docker run -d -p 9000:9000 -v /etc/webhook:/etc/webhook --name=${CONTAINER_NAME} \\" @echo " ${DOCKER_IMAGE_NAME} -verbose -hooks=/etc/webhook/hooks.json -hotreload" - -build_rpm: - git archive --format=tar.gz --prefix webhook-$(COMMIT)/ --output $(TEMPDIR)/webhook-$(SHORTCOMMIT).tar.gz $(COMMIT) - rpmbuild -ta --define "_commit $(COMMIT)" $(TEMPDIR)/webhook-$(SHORTCOMMIT).tar.gz - diff --git a/README.md b/README.md index 54fdb910915..7f3f4038b51 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Join the chat at https://gitter.im/adnanh/webhook](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/adnanh/webhook?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Flattr this](https://button.flattr.com/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=adnanh&url=https%3A%2F%2Fwww.github.com%2Fadnanh%2Fwebhook) [![Build Status](https://travis-ci.org/adnanh/webhook.svg?branch=master)](https://travis-ci.org/adnanh/webhook) +[![Join the chat at https://gitter.im/adnanh/webhook](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/adnanh/webhook?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Flattr this](https://button.flattr.com/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=adnanh&url=https%3A%2F%2Fwww.github.com%2Fadnanh%2Fwebhook) # What is webhook? [webhook](https://github.com/adnanh/webhook/) is a lightweight configurable tool written in Go, that allows you to easily create HTTP endpoints (hooks) on your server, which you can use to execute configured commands. You can also pass data from the HTTP request (such as headers, payload or query variables) to your commands. [webhook](https://github.com/adnanh/webhook/) also allows you to specify rules which have to be satisfied in order for the hook to be triggered. diff --git a/golang-github-adnanh-webhook.spec b/golang-github-adnanh-webhook.spec deleted file mode 100644 index be361313723..00000000000 --- a/golang-github-adnanh-webhook.spec +++ /dev/null @@ -1,186 +0,0 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 0 -%global with_debug 1 -%global with_check 1 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 -%global with_check 0 -%global with_unit_test 0 -%endif - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%global provider github -%global provider_tld com -%global project adnanh -%global repo webhook -# https://github.com/adnanh/webhook -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%if 0%{?_commit:1} -# rpmbuild -ba --define "_commit 409b441c31f83279af0db289123eb4b0b14809a6" *.spec -%global commit %{_commit} -%else -%global commit 409b441c31f83279af0db289123eb4b0b14809a6 -%endif -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.1.git%{shortcommit}%{?dist} -Summary: webhook is a lightweight configurable webhook server written in Go -License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - -%if ! 0%{?with_bundled} -BuildRequires: golang(github.com/codegangsta/negroni) -BuildRequires: golang(github.com/gorilla/mux) -#BuildRequires: golang(gopkg.in/fsnotify.v1) -BuildRequires: golang(github.com/go-fsnotify/fsnotify) -%endif - -%description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - - -Provides: golang(%{import_path}/hook) = %{version}-%{release} - -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif - -%prep -%setup -q -n %{repo}-%{commit} - -%build -mkdir -p src/github.com/adnanh -ln -s ../../../ src/github.com/adnanh/webhook - -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath} -%endif - -%gobuild -o bin/webhook %{import_path} - -%install -install -d -p %{buildroot}%{_bindir} -install -p -m 0755 bin/webhook %{buildroot}%{_bindir} -install -d -p %{buildroot}%{_initrddir} -install -p -m 0755 webhook.init %{buildroot}%{_initrddir}/webhook -install -d -p %{buildroot}%{_sysconfdir}/webhook/ -install -p -m 0640 hooks.json.example %{buildroot}%{_sysconfdir}/webhook/ - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go" -or -iname "hooks.json.example"); do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} -%endif - -%gotest %{import_path}/hook -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%files -%license LICENSE -%doc README.md hooks.json.example -%config(noreplace)%{_sysconfdir}/webhook/* -%{_bindir}/webhook -%{_initrddir}/webhook - -%if 0%{?with_devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md -%endif - -%changelog -* Thu Oct 29 2015 Tim Hughes - 0-0.1.git409b441 -- First package for Fedora - - diff --git a/webhook.init b/webhook.init deleted file mode 100644 index 6a14f7cf843..00000000000 --- a/webhook.init +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh -# -# Start the Webhook daemon -# -# chkconfig: 35 82 16 -# description: webhook is a lightweight configurable tool written in Go, that \ -# allows you to easily create HTTP endpoints (hooks) on your server, which \ -# you can use to execute configured commands. - -### BEGIN INIT INFO -# Provides: webhook -# Required-Start: $syslog $local_fs -# Required-Stop: $syslog $local_fs -# Should-Start: 0 1 2 6 -# Should-Stop: 3 5 -# Default-Start: 0 1 2 6 -# Default-Stop: 3 5 -# Short-Description: webhook allows you to easily create HTTP endpoints (hooks) on your server -# Description: webhook allows you to easily create HTTP endpoints (hooks) on your server -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -exec="/usr/bin/webhook" -prog="webhook" -config="/etc/webhook/hooks.json" - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - - - - -lockfile=/var/lock/subsys/$prog -pidfile=/var/run/$prog.pid - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - # if not running, start it up here, usually something like "daemon $exec" - ((exec $exec -hooks=$config $OPTIONS &>/dev/null)&) - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $?