From 886f9259158acc1ac3e3991717901a2d6ead31c3 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 27 Jan 2015 19:45:13 +0100 Subject: [PATCH 1/6] add listen directive to enable IPv6 --- docs/changelog.rst | 2 ++ gvaweb/webtasks/templates/vhost.nginx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 4ca1479..254d4e3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,8 @@ Changelog ========= +* :bug:`-` add listen directive to enable IPv6 + * :release:`0.1.1 <2015-01-27>` * :bug:`-` force symlink creation for enable_web_vhost task to make it idempotent diff --git a/gvaweb/webtasks/templates/vhost.nginx b/gvaweb/webtasks/templates/vhost.nginx index 16fa179..437614c 100644 --- a/gvaweb/webtasks/templates/vhost.nginx +++ b/gvaweb/webtasks/templates/vhost.nginx @@ -4,6 +4,8 @@ server { server_name *.{{ domain|parentdomain }}; {%- endif %} + listen [::]:80; + access_log /var/log/nginx/{{ domain }}.access.log; error_log /var/log/nginx/{{ domain }}.error.log; From 659b98d6a29ede73710eb4831617b9cdbdb4269a Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 25 Sep 2016 01:10:45 +0200 Subject: [PATCH 2/6] Ignore PyCharm files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 79f6256..b2b9bd3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ Desktop.ini .ropeproject _build/ *.sqlite3 +.idea/ From c639c8c68d4f3ef9a7de12991340dbee7ffa4ad0 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 20 Aug 2017 13:32:57 +0200 Subject: [PATCH 3/6] Add Vagrantfile and salt bootstrap config --- .gitignore | 1 + Vagrantfile | 27 +++++++++++++++++++++++++++ salt/bootstrap.sh | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 Vagrantfile create mode 100755 salt/bootstrap.sh diff --git a/.gitignore b/.gitignore index b2b9bd3..da9d74b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ Desktop.ini _build/ *.sqlite3 .idea/ +.vagrant/ diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..20e5de0 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,27 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + config.vm.box = "debian/contrib-jessie64" + + config.vm.hostname = "gvaweb.local" + config.vm.network "private_network", ip: "172.16.3.5" + + config.vm.synced_folder "../gvasalt/states/", "/srv/salt/" + config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/" + + config.vm.provider "virtualbox" do |vb| + # vb.gui = true + vb.memory = "512" + end + + config.vm.provision :salt do |salt| + salt.bootstrap_script = "salt/bootstrap.sh" + salt.minion_id = "gvaweb" + salt.masterless = true + salt.run_highstate = true + salt.verbose = true + salt.colorize = true + salt.log_level = "warning" + end +end \ No newline at end of file diff --git a/salt/bootstrap.sh b/salt/bootstrap.sh new file mode 100755 index 0000000..e95237c --- /dev/null +++ b/salt/bootstrap.sh @@ -0,0 +1,38 @@ +#!/bin/sh - + +echo "deb http://httpredir.debian.org/debian jessie-backports main" >/etc/apt/sources.list.d/backports.list + +apt-get update +apt-get install -y -t jessie-backports python-cryptography + +# We just download the bootstrap script by default and execute that. +if [ -x /usr/bin/fetch ]; then + /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@" +elif [ -x /usr/bin/curl ]; then + /usr/bin/curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@" +else + python \ + -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' \ + | sh -s -- "$@" +fi + +cat >/etc/salt/minion </etc/salt/grains < Date: Sun, 30 Jun 2019 11:54:49 +0200 Subject: [PATCH 4/6] Ignore disabled sites' nginx configuration Fixes #5 --- gvaweb/webtasks/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvaweb/webtasks/tasks.py b/gvaweb/webtasks/tasks.py index 608ae8c..ad624ee 100644 --- a/gvaweb/webtasks/tasks.py +++ b/gvaweb/webtasks/tasks.py @@ -113,7 +113,7 @@ def disable_web_vhost(sitename): """ try: subprocess.check_output([ - SUDO_CMD, RM_CMD, _build_enabled_vhost_path(sitename)], + SUDO_CMD, RM_CMD, "-f", _build_enabled_vhost_path(sitename)], stderr=subprocess.STDOUT) subprocess.check_output([ SUDO_CMD, SERVICE_CMD, 'nginx', 'reload'], From a3f102cf3552c3d0394263b914a24284511d510e Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 30 Jun 2019 12:25:16 +0200 Subject: [PATCH 5/6] Update dependencies to latest patch level --- requirements/base.txt | 12 ++++++------ requirements/local.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index fa14272..b31154d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,8 +1,8 @@ -amqp==1.4.6 -bpython==0.13.1 +amqp==1.4.9 +bpython==0.13.2 anyjson==0.3.3 -billiard==3.3.0.19 -celery==3.1.17 -kombu==3.0.24 -pytz==2014.10 +billiard==3.3.0.23 +celery==3.1.26.post2 +kombu==3.0.37 +pytz==2019.1 Jinja2==2.7.3 diff --git a/requirements/local.txt b/requirements/local.txt index d0cecd4..18c2e32 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -2,5 +2,5 @@ -r base.txt coverage==3.7.1 Sphinx==1.2.3 -sqlparse==0.1.14 +sqlparse==0.1.19 releases==0.7.0 From 80c8753df05da63fde2af43d94e7413a12cfcf51 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 30 Jun 2019 12:25:46 +0200 Subject: [PATCH 6/6] Update versions and URLs, document fixed issue --- docs/changelog.rst | 2 ++ docs/conf.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 254d4e3..0cd3bad 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,8 @@ Changelog ========= +* :release:`0.1.2 <2019-06-30>` +* :bug:`5` ignore missing site configuration when disabling sites * :bug:`-` add listen directive to enable IPv6 * :release:`0.1.1 <2015-01-27>` diff --git a/docs/conf.py b/docs/conf.py index f4c0ce5..804c5b3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -38,9 +38,9 @@ extensions = ['releases', 'sphinx.ext.autodoc', 'celery.contrib.sphinx'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] -releases_issue_uri = 'https://dev.gnuviech-server.de/gvaweb/ticket/%s' +releases_issue_uri = 'https://git.dittberner.info/gnuviech/gvaweb/issues/%s' -releases_release_uri = 'https://dev.gnuviech-server.de/gvaweb/milestone/%s' +releases_release_uri = 'https://git.dittberner.info/gnuviech/gvaweb/src/tag/%s' # The suffix of source filenames. source_suffix = '.rst' @@ -53,7 +53,7 @@ master_doc = 'index' # General information about the project. project = u'gvaweb' -copyright = u'2015, Jan Dittberner' +copyright = u'2015-2019, Jan Dittberner' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -62,7 +62,7 @@ copyright = u'2015, Jan Dittberner' # The short X.Y version. version = '0.1' # The full version, including alpha/beta/rc tags. -release = '0.1.1' +release = '0.1.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.