Changeset - 02686b6dcfc0
[Not reviewed]
1.2.0 1.2
0 6 0
Branko Majic (branko) - 9 years ago 2016-12-03 21:45:28
branko@majic.rs
MAR-84: Preparing for release 1.2.0. Updated years in copyright notices.
6 files changed with 34 insertions and 9 deletions:
0 comments (0 inline, 0 general)
LICENSE
Show inline comments
 
Copyright (c) 2014, Branko Majic
 
Copyright (c) 2016, Branko Majic
 
All rights reserved.
 

	
 
Redistribution and use in source and binary forms, with or without modification,
 
are permitted provided that the following conditions are met:
 

	
 
  Redistributions of source code must retain the above copyright notice, this
docs/about.rst
Show inline comments
 
@@ -105,13 +105,13 @@ found at:
 

	
 
License
 
-------
 

	
 
Majic Ansible Roles is released under terms of *BSD (3-Clause) License*::
 

	
 
  Copyright (c) 2015, Branko Majic
 
  Copyright (c) 2016, Branko Majic
 
  All rights reserved.
 

	
 
  Redistribution and use in source and binary forms, with or without modification,
 
  are permitted provided that the following conditions are met:
 

	
 
    Redistributions of source code must retain the above copyright notice, this
docs/conf.py
Show inline comments
 
@@ -41,22 +41,22 @@ source_suffix = '.rst'
 

	
 
# The master toctree document.
 
master_doc = 'index'
 

	
 
# General information about the project.
 
project = u'Majic Ansible Roles'
 
copyright = u'2014, Branko Majic'
 
copyright = u'2016, Branko Majic'
 

	
 
# The version info for the project you're documenting, acts as replacement for
 
# |version| and |release|, also used in various other places throughout the
 
# built documents.
 
#
 
# The short X.Y version.
 
version = '1.1-dev'
 
version = '1.2.0'
 
# The full version, including alpha/beta/rc tags.
 
release = '1.1-dev'
 
release = '1.2.0'
 

	
 
# The language for content autogenerated by Sphinx. Refer to documentation
 
# for a list of supported languages.
 
#
 
# This is also used if you do content translation via gettext catalogs.
 
# Usually you set "language" from the command line for these cases.
docs/releasenotes.rst
Show inline comments
 
Release notes
 
=============
 

	
 

	
 
1.2.0
 
-----
 

	
 
Minor fixes and features.
 

	
 
New features:
 

	
 
* ``wsgi_website`` role
 

	
 
  * Added support for providing custom proxy headers to pass on to Gunicorn
 
    server.
 

	
 
Bug-fixes:
 

	
 
* ``php_website`` role
 

	
 
  * Make sure the environment indicator is always shown on top by increasing its
 
    ``z-index`` value.
 

	
 
* ``wsgi_website`` role
 

	
 
  * Make sure the environment indicator is always shown on top by increasing its
 
    ``z-index`` value.
 

	
 

	
 
1.1.0
 
-----
 

	
 
Minor bug fixes, enchancements, and features.
 

	
 
New features/improvements:
docs/usage.rst
Show inline comments
 
@@ -142,13 +142,13 @@ Ansible Roles:
 

	
 
     git clone http://code.majic.rs/majic-ansible-roles ~/majic-ansible-roles
 

	
 
2. Checkout the correct version of the roles::
 

	
 
     cd ~/majic-ansible-roles/
 
     git checkout -b 1.1.0 1.1.0
 
     git checkout -b 1.2.0 1.2.0
 

	
 

	
 
Preparing the basic site configuration
 
--------------------------------------
 

	
 
Phew... Now that was a bit tedious and boring... But at least you are now ready
roles/web_server/files/nginx_verify_site.sh
Show inline comments
 
#!/bin/bash
 
#
 
# nginx_verify_site.sh
 
#
 
# Copyright (C) 2015, Branko Majic <branko@majic.rs>
 
# Copyright (C) 2016, Branko Majic <branko@majic.rs>
 
#
 
# This program 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 3 of the License, or
 
# (at your option) any later version.
 
#
 
@@ -57,13 +57,13 @@ EOF
 

	
 
function version() {
 
        cat <<EOF
 
$program, version $version
 

	
 
+-----------------------------------------------------------------------+
 
| Copyright (C) 2015, Branko Majic <branko@majic.rs>                    |
 
| Copyright (C) 2016, Branko Majic <branko@majic.rs>                    |
 
|                                                                       |
 
| This program 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 3 of the License, or     |
 
| (at your option) any later version.                                   |
 
|                                                                       |
 
@@ -177,7 +177,7 @@ find "$temp_config" -type f -print0 | xargs -0 sed -i -e "s#$original_config#$te
 

	
 
# Enable the new site configuration in temporary copy.
 
rm -f "$temp_config/nginx/sites-enabled/$name"
 
cp "$site_configuration_file" "$temp_config/nginx/sites-enabled/$name"
 

	
 
# Finally, run the test.
 
nginx -t -c "$temp_config/nginx/nginx.conf"
 
\ No newline at end of file
 
nginx -t -c "$temp_config/nginx/nginx.conf"
0 comments (0 inline, 0 general)