Populating formula from local repository
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aa8e42a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.kitchen
+tests/build/
+*.swp
+*.pyc
+.ropeproject
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..77bc996
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,6 @@
+TinyProxy formula
+=================
+
+0.1 (2017-10-23)
+
+- Initial commit
diff --git a/LICENSE b/LICENSE
index 8dada3e..e904e80 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright {yyyy} {name of copyright owner}
+ Copyright 2017 Dzmitry Stremkouski.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1043fbe
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,118 @@
+DESTDIR=/
+SALTENVDIR=/usr/share/salt-formulas/env
+RECLASSDIR=/usr/share/salt-formulas/reclass
+FORMULANAME=$(shell grep name: metadata.yml|head -1|cut -d : -f 2|grep -Eo '[a-z0-9\-\_]*')
+VERSION=$(shell grep version: metadata.yml|head -1|cut -d : -f 2|grep -Eo '[a-z0-9\.\-\_]*')
+VERSION_MAJOR := $(shell echo $(VERSION)|cut -d . -f 1-2)
+VERSION_MINOR := $(shell echo $(VERSION)|cut -d . -f 3)
+
+NEW_MAJOR_VERSION ?= $(shell date +%Y.%m|sed 's,\.0,\.,g')
+NEW_MINOR_VERSION ?= $(shell /bin/bash -c 'echo $$[ $(VERSION_MINOR) + 1 ]')
+
+MAKE_PID := $(shell echo $$PPID)
+JOB_FLAG := $(filter -j%, $(subst -j ,-j,$(shell ps T | grep "^\s*$(MAKE_PID).*$(MAKE)")))
+
+ifneq ($(subst -j,,$(JOB_FLAG)),)
+JOBS := $(subst -j,,$(JOB_FLAG))
+else
+JOBS := 1
+endif
+
+KITCHEN_LOCAL_YAML?=.kitchen.yml
+KITCHEN_OPTS?="--concurrency=$(JOBS)"
+KITCHEN_OPTS_CREATE?=""
+KITCHEN_OPTS_CONVERGE?=""
+KITCHEN_OPTS_VERIFY?=""
+KITCHEN_OPTS_TEST?=""
+
+all:
+ @echo "make install - Install into DESTDIR"
+ @echo "make test - Run tests"
+ @echo "make kitchen - Run Kitchen CI tests (create, converge, verify)"
+ @echo "make clean - Cleanup after tests run"
+ @echo "make release-major - Generate new major release"
+ @echo "make release-minor - Generate new minor release"
+ @echo "make changelog - Show changes since last release"
+
+install:
+ # Formula
+ [ -d $(DESTDIR)/$(SALTENVDIR) ] || mkdir -p $(DESTDIR)/$(SALTENVDIR)
+ cp -a $(FORMULANAME) $(DESTDIR)/$(SALTENVDIR)/
+ [ ! -d _modules ] || cp -a _modules $(DESTDIR)/$(SALTENVDIR)/
+ [ ! -d _states ] || cp -a _states $(DESTDIR)/$(SALTENVDIR)/ || true
+ [ ! -d _grains ] || cp -a _grains $(DESTDIR)/$(SALTENVDIR)/ || true
+ # Metadata
+ [ -d $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME) ] || mkdir -p $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME)
+ cp -a metadata/service/* $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME)
+
+test:
+ [ ! -d tests ] || (cd tests; ./run_tests.sh)
+
+release-major: check-changes
+ @echo "Current version is $(VERSION), new version is $(NEW_MAJOR_VERSION)"
+ @[ $(VERSION_MAJOR) != $(NEW_MAJOR_VERSION) ] || (echo "Major version $(NEW_MAJOR_VERSION) already released, nothing to do. Do you want release-minor?" && exit 1)
+ echo "$(NEW_MAJOR_VERSION)" > VERSION
+ sed -i 's,version: .*,version: "$(NEW_MAJOR_VERSION)",g' metadata.yml
+ [ ! -f debian/changelog ] || dch -v $(NEW_MAJOR_VERSION) -m --force-distribution -D `dpkg-parsechangelog -S Distribution` "New version"
+ make genchangelog-$(NEW_MAJOR_VERSION)
+ (git add -u; git commit -m "Version $(NEW_MAJOR_VERSION)")
+ git tag -s -m $(NEW_MAJOR_VERSION) $(NEW_MAJOR_VERSION)
+
+release-minor: check-changes
+ @echo "Current version is $(VERSION), new version is $(VERSION_MAJOR).$(NEW_MINOR_VERSION)"
+ echo "$(VERSION_MAJOR).$(NEW_MINOR_VERSION)" > VERSION
+ sed -i 's,version: .*,version: "$(VERSION_MAJOR).$(NEW_MINOR_VERSION)",g' metadata.yml
+ [ ! -f debian/changelog ] || dch -v $(VERSION_MAJOR).$(NEW_MINOR_VERSION) -m --force-distribution -D `dpkg-parsechangelog -S Distribution` "New version"
+ make genchangelog-$(VERSION_MAJOR).$(NEW_MINOR_VERSION)
+ (git add -u; git commit -m "Version $(VERSION_MAJOR).$(NEW_MINOR_VERSION)")
+ git tag -s -m $(NEW_MAJOR_VERSION) $(VERSION_MAJOR).$(NEW_MINOR_VERSION)
+
+check-changes:
+ @git log --pretty=oneline --decorate $(VERSION)..HEAD | grep -Eqc '.*' || (echo "No new changes since version $(VERSION)"; exit 1)
+
+changelog:
+ git log --pretty=short --invert-grep --grep="Merge pull request" --decorate $(VERSION)..HEAD
+
+genchangelog: genchangelog-$(VERSION_MAJOR).$(NEW_MINOR_VERSION)
+
+genchangelog-%:
+ $(eval NEW_VERSION := $(patsubst genchangelog-%,%,$@))
+ (echo "=========\nChangelog\n=========\n"; \
+ (echo $(NEW_VERSION);git tag) | sort -r | grep -E '^[0-9\.]+' | while read i; do \
+ cur=$$i; \
+ test $$i = $(NEW_VERSION) && i=HEAD; \
+ prev=`(echo $(NEW_VERSION);git tag)|sort|grep -E '^[0-9\.]+'|grep -B1 "$$cur\$$"|head -1`; \
+ echo "Version $$cur\n=============================\n"; \
+ git log --pretty=short --invert-grep --grep="Merge pull request" --decorate $$prev..$$i; \
+ echo; \
+ done) > CHANGELOG.rst
+
+kitchen-check:
+ @[ -e $(KITCHEN_LOCAL_YAML) ] || (echo "Kitchen tests not available, there's no $(KITCHEN_LOCAL_YAML)." && exit 1)
+
+kitchen: kitchen-check kitchen-create kitchen-converge kitchen-verify kitchen-list
+
+kitchen-create: kitchen-check
+ kitchen create ${KITCHEN_OPTS} ${KITCHEN_OPTS_CREATE}
+ [ "$(shell echo $(KITCHEN_LOCAL_YAML)|grep -Eo docker)" = "docker" ] || sleep 120
+
+kitchen-converge: kitchen-check
+ kitchen converge ${KITCHEN_OPTS} ${KITCHEN_OPTS_CONVERGE} &&\
+ kitchen converge ${KITCHEN_OPTS} ${KITCHEN_OPTS_CONVERGE}
+
+kitchen-verify: kitchen-check
+ [ ! -d tests/integration ] || kitchen verify -t tests/integration ${KITCHEN_OPTS} ${KITCHEN_OPTS_VERIFY}
+ [ -d tests/integration ] || kitchen verify ${KITCHEN_OPTS} ${KITCHEN_OPTS_VERIFY}
+
+kitchen-test: kitchen-check
+ [ ! -d tests/integration ] || kitchen test -t tests/integration ${KITCHEN_OPTS} ${KITCHEN_OPTS_TEST}
+ [ -d tests/integration ] || kitchen test ${KITCHEN_OPTS} ${KITCHEN_OPTS_TEST}
+
+kitchen-list: kitchen-check
+ kitchen list
+
+clean:
+ [ ! -x "$(shell which kitchen)" ] || kitchen destroy
+ [ ! -d .kitchen ] || rm -rf .kitchen
+ [ ! -d tests/build ] || rm -rf tests/build
+ [ ! -d build ] || rm -rf build
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..cdc2a35
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,19 @@
+=================
+TinyProxy Formula
+=================
+
+Sample Pillars
+==============
+
+TinyProxy: Basic configuration
+
+.. code-block:: yaml
+
+ tinyproxy:
+ enabled: true
+
+
+More Information
+================
+
+* https://en.wikipedia.org/wiki/Tinyproxy
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..49d5957
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..90a08c7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+salt-formula-tinyproxy (0.1) xenial; urgency=medium
+
+ * First public release
+
+ -- Dzmitry Stremkouski <mitroko@gmail.com> Mon, 23 Oct 2017 11:05:16 +0300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..03f96bd
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: salt-formula-tinyproxy
+Maintainer: Dzmitry Stremkouski <mitroko@gmail.com>
+Section: admin
+Priority: optional
+Build-Depends: salt-master, python, python-yaml, debhelper (>= 9)
+Standards-Version: 3.9.6
+Homepage: https://github.com/mitroko/salt-formula-tinyproxy
+Vcs-Browser: https://github.com/mitroko/salt-formula-tinyproxy
+Vcs-Git: https://github.com/mitroko/salt-formula-tinyproxy.git
+
+Package: salt-formula-tinyproxy
+Architecture: all
+Depends: ${misc:Depends}, salt-master, reclass
+Description: TinyProxy salt formula
+ Install and configure TinyProxy service. Customize tinyproxy rules.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..78203cc
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,15 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: salt-formula-tinyproxy
+Upstream-Contact: Dzmitry Stremkouski <mitroko@gmail.com>
+Source: https://github.com/mitroko/salt-formula-tinyproxy
+
+Files: *
+Copyright: 2017 Dzmitry Stremkouski.
+License: Apache-2.0
+ Copyright (C) 2017 Dzmitry Stremkouski.
+ .
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ .
+ On a Debian system you can find a copy of this license in
+ /usr/share/common-licenses/Apache-2.0.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..d585829
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+README.rst
+CHANGELOG.rst
+VERSION
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..abde6ef
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/metadata.yml b/metadata.yml
new file mode 100644
index 0000000..a8f9fac
--- /dev/null
+++ b/metadata.yml
@@ -0,0 +1,3 @@
+name: "tinyproxy"
+version: "0.1"
+source: "https://github.com/mitroko/salt-formula-tinyproxy"
diff --git a/metadata/service/service.yml b/metadata/service/service.yml
new file mode 100644
index 0000000..5b1bded
--- /dev/null
+++ b/metadata/service/service.yml
@@ -0,0 +1,5 @@
+applications:
+- tinyproxy
+parameters:
+ tinyproxy:
+ enabled: true
diff --git a/tinyproxy/files/tinyproxy.conf b/tinyproxy/files/tinyproxy.conf
new file mode 100644
index 0000000..0790c05
--- /dev/null
+++ b/tinyproxy/files/tinyproxy.conf
@@ -0,0 +1,31 @@
+{%- if pillar.tinyproxy is defined %}
+{%- from "tinyproxy/map.jinja" import service with context %}
+{%- endif %}
+
+User {{ service.get('user', 'nobody') }}
+Group {{ service.get('group', 'nogroup') }}
+Port {{ service.get('port', '8888') }}
+Timeout {{ service.get('timeout', '900') }}
+Logfile "/var/log/tinyproxy/tinyproxy.log"
+LogLevel {{ service.get('log_level', 'Info') }}
+PidFile "/var/run/tinyproxy/tinyproxy.pid"
+XTinyproxy Yes
+Listen {{ service.get('listen', '127.0.0.1') }}
+{%- if service.upstream is defined %}
+Upstream {{ service.get('upstream', '127.0.0.1:3128') }}
+{%- endif %}
+MaxClients {{ service.get('max_clients', '550') }}
+MinSpareServers {{ service.get('minspareservers', '15') }}
+MaxSpareServers {{ service.get('maxspareservers', '20') }}
+StartServers {{ service.get('startservers', '15') }}
+MaxRequestsPerChild {{ service.get('maxrequestsperchild', '0') }}
+{%- for net in service.get('allow_nets', ['127.0.0.1']) %}
+Allow {{ net }}
+{%- endfor %}
+DisableViaHeader Yes
+Anonymous "Host"
+Anonymous "Authorization"
+Anonymous "Cookie"
+{%- for port in service.get('connect_ports', []) %}
+ConnectPort {{ port }}
+{%- endfor %}
diff --git a/tinyproxy/init.sls b/tinyproxy/init.sls
new file mode 100644
index 0000000..11e507d
--- /dev/null
+++ b/tinyproxy/init.sls
@@ -0,0 +1,4 @@
+{%- if pillar.tinyproxy is defined %}
+include:
+- tinyproxy.service
+{%- endif %}
diff --git a/tinyproxy/map.jinja b/tinyproxy/map.jinja
new file mode 100644
index 0000000..1813feb
--- /dev/null
+++ b/tinyproxy/map.jinja
@@ -0,0 +1,9 @@
+{% set service = salt['grains.filter_by'](
+ {
+ 'Debian': {
+ 'pkgs': ["tinyproxy"],
+ 'service': 'tinyproxy',
+ },
+ },
+ merge = salt['pillar.get']('tinyproxy')
+) %}
diff --git a/tinyproxy/service.sls b/tinyproxy/service.sls
new file mode 100644
index 0000000..850ccbe
--- /dev/null
+++ b/tinyproxy/service.sls
@@ -0,0 +1,21 @@
+{%- from "tinyproxy/map.jinja" import service with context %}
+
+tinyproxy_packages:
+ pkg.installed:
+ - names: {{ service.pkgs }}
+
+tinyproxy_config:
+ file.managed:
+ - name: /etc/tinyproxy/tinyproxy.conf
+ - source: salt://tinyproxy/files/tinyproxy.conf
+ - template: jinja
+ - user: root
+ - group: root
+ - mode: 644
+
+tinyproxy_service:
+ service.running:
+ - name: {{ service.service }}
+ - enable: true
+ - watch:
+ - file: tinyproxy_config