solves issue saltstack-formulas#34

fortunejuggle · Oct 27, 2018 · fc662bb · fc662bb
1 parent 8b3102b
commit fc662bb
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 14 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -58,6 +58,7 @@ suites:
         letsencrypt.sls:
           letsencrypt:
             use_package: false
+            version: 0.26.x
             config: |
               server = https://acme-staging.api.letsencrypt.org/directory
               email = [email protected]

diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ env:
     - INSTANCE=git-ubuntu-1604
     - INSTANCE=git-ubuntu-1804
     - INSTANCE=git-centos-7
-    - INSTANCE=debian-9
-    - INSTANCE=centos-7
+    - INSTANCE=deb-debian-9
+    - INSTANCE=rpm-centos-7
 
 before_install:
   - bundle install

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "unf"
-gem 'rake'
 gem "test-kitchen", '>=1.23.2'
 gem "kitchen-docker"
 gem "kitchen-salt", ">=0.3.3"
 gem "kitchen-inspec"
-gem 'inspec'
 
diff --git a/README.rst b/README.rst
@@ -4,6 +4,8 @@ letsencrypt-formula
 
 Creates certificates and manages renewal using the letsencrypt service.
 
+.. image:: https://travis-ci.org/saltstack-formulas/letsencrypt-formula.svg?branch=master
+
 .. note::
 
     See the full `Salt Formulas installation and usage instructions

diff --git a/letsencrypt/defaults.yaml b/letsencrypt/defaults.yaml
@@ -6,6 +6,7 @@ letsencrypt:
     - python-certbot-apache
   service: certbot.timer
   cli_install_dir: /opt/letsencrypt
+#  version: 0.26.x # if use_packe false and if you want to have specific version of certbot you can enable it
   config_dir:
     path: /etc/letsencrypt
     user: root

diff --git a/letsencrypt/install.sls b/letsencrypt/install.sls
@@ -9,9 +9,15 @@ letsencrypt-client:
   {% else %}
   pkg.installed:
     - name: git
-
+  {% if letsencrypt.version is defined and letsencrypt.version|length %}
+  git.cloned:
+    - name: https://github.com/letsencrypt/letsencrypt
+    - branch: {{ letsencrypt.version }}
+    - target: {{ letsencrypt.cli_install_dir }}
+  {% else %}
   git.latest:
     - name: https://github.com/letsencrypt/letsencrypt
     - target: {{ letsencrypt.cli_install_dir }}
     - force_reset: True
   {% endif %}
+  {% endif %}
diff --git a/pillar.example b/pillar.example
@@ -5,6 +5,8 @@ letsencrypt:
                                                  # need a single one, but you can also add other plugins here
 
   cli_install_dir: /opt/letsencrypt              # Only used for the git install method
+  version: 0.26.x                                # if use_packe false and if you want to have specific version
+                                                 # of certbot you can enable it without version git.latest is used
 
   config: |
     server = https://acme-v01.api.letsencrypt.org/directory

diff --git a/...ration/deb/serverspec/letsencrypt_spec.rb → test/integration/deb/letsencrypt_spec.rb b/...ration/deb/serverspec/letsencrypt_spec.rb → test/integration/deb/letsencrypt_spec.rb
diff --git a/...ration/git/serverspec/letsencrypt_spec.rb → test/integration/git/letsencypt_spec.rb b/...ration/git/serverspec/letsencrypt_spec.rb → test/integration/git/letsencypt_spec.rb
diff --git a/...ration/rpm/serverspec/letsencrypt_spec.rb → test/integration/rpm/letsencrypt_spec.rb b/...ration/rpm/serverspec/letsencrypt_spec.rb → test/integration/rpm/letsencrypt_spec.rb
@@ -22,4 +22,4 @@
   it { should be_executable }
   it { should be_owned_by 'root' }
   it { should be_grouped_into 'root' }
-end
+end