Skip to content
Browse files

Merge branch 'master' of git.sws.sina.com.cn:dough/dough

  • Loading branch information...
2 parents beda4fa + 9065308 commit 672a0f86821c6e9555f915a5eb5238f2d2b814e5 pyw committed
View
4 .gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=10.210.228.21
+port=29418
+project=dough.git
View
6 debian/README.Debian
@@ -0,0 +1,6 @@
+dough for Debian
+----------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Tang Yaguang <yaguang@staff.sina.com.cn> Mon, 23 Jul 2012 15:44:27 +0800
View
9 debian/README.source
@@ -0,0 +1,9 @@
+dough for Debian
+----------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+
View
5 debian/changelog
@@ -0,0 +1,5 @@
+dough (0.1.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+
+ -- Tang Yaguang <yaguang@staff.sina.com.cn> Mon, 23 Jul 2012 15:44:27 +0800
View
1 debian/compat
@@ -0,0 +1 @@
+8
View
27 debian/control
@@ -0,0 +1,27 @@
+Source: dough
+Section: net
+Priority: extra
+Maintainer: Tang Yaguang <yaguang@staff.sina.com.cn>
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.2
+Homepage: https://git.sws.sina.com.cn/dough
+#Vcs-Git: git://git.debian.org/collab-maint/dough.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/dough.git;a=summary
+
+Package: dough-common
+Architecture: all
+Depends: libzmq1,python-zmq
+Description: dough common lib
+ sina sws dough billing system toolset
+
+Package: dough-api
+Architecture: all
+Depends: dough-common
+Description: dough api
+ sina sws dough-api
+
+Package: dough-farmer
+Architecture: all
+Depends: dough-common
+Description: dough farmer
+ sina sws dough-farmer.
View
36 debian/copyright
@@ -0,0 +1,36 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: dough
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+ <years> <likewise for another author>
+License: <special license>
+ <Put the license of the package here indented by 1 space>
+ <This follows the format of Description: lines in control file>
+ .
+ <Including paragraphs>
+
+# If you want to use GPL v2 or later for the /debian/* files use
+# the following clauses, or change it to suit. Delete these two lines
+Files: debian/*
+Copyright: 2012 Tang Yaguang <yaguang@staff.sina.com.cn>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
View
1 debian/dough-api.install
@@ -0,0 +1 @@
+bin/dough-api /usr/bin/
View
5 debian/dough-api.logrotate
@@ -0,0 +1,5 @@
+/var/log/dough/*.log{
+rotate 15
+
+
+}
View
20 debian/dough-api.upstart
@@ -0,0 +1,20 @@
+description "dough billing api service"
+author "yaguang <yaguang@staff.sina.com.cn>"
+
+start on (filesystem and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/dough
+ chown dough:root /var/run/dough/
+
+ mkdir -p /var/lock/dough
+ chown dough:root /var/lock/dough/
+
+end script
+
+exec su -s /bin/sh -c "exec dough-api " dough
View
2 debian/dough-common.install
@@ -0,0 +1,2 @@
+usr/lib/python*/dist-packages/*
+etc/dough/dough.conf.sample /etc/dough/
View
11 debian/dough-common.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+ if ! getent group dough> /dev/null 2>&1; then
+ addgroup --system dough>/dev/null
+ fi
+ if ! getent passwd dough> /dev/null 2>&1; then
+ adduser --system --home /var/lib/dough --ingroup dough --no-create-home --shell /bin/false dough
+ fi
+mkdir -p /var/log/dough
+chown -R dough:dough /var/log/dough /etc/dough/
View
35 debian/dough-common.preinst
@@ -0,0 +1,35 @@
+#!/bin/sh
+# preinst script for dough
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ install|upgrade)
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
View
1 debian/dough-farmer.install
@@ -0,0 +1 @@
+bin/dough-farmer /usr/bin/
View
20 debian/dough-farmer.upstart
@@ -0,0 +1,20 @@
+description "dough billing worker service"
+author "yaguang <yaguang@staff.sina.com.cn>"
+
+start on (filesystem and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/dough
+ chown dough:root /var/run/dough/
+
+ mkdir -p /var/lock/dough
+ chown dough:root /var/lock/dough/
+
+end script
+
+exec su -s /bin/sh -c "exec dough-farmer" dough
View
21 debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+
+%:
+ dh $@ --with python2
View
23 debian/watch
@@ -0,0 +1,23 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php dough-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/dough-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/dough-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+# http://sf.net/dough/dough-(.*)\.tar\.gz
+
+# Uncomment to find new files on GooglePages
+# http://example.googlepages.com/foo.html dough-(.*)\.tar\.gz
View
9 setup.py
@@ -12,7 +12,7 @@
setup(
name = "dough",
- version = "0.1",
+ version = "0.1.1",
description = "OpenStack Billing System",
long_description = "OpenStack Billing System",
url = 'https://github.com/lzyeval/dough',
@@ -27,8 +27,11 @@
'Intended Audience :: Information Technology',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
- ],
+ 'Programming Language :: Python',],
+ scripts=['bin/dough-api',
+ 'bin/dough-farmer',
+ 'bin/dough-manager',
+ 'bin/dough-client',],
install_requires = requirements
)
"""

0 comments on commit 672a0f8

Please sign in to comment.
Something went wrong with that request. Please try again.