Mercurial > repos > other > Puppet

changeset 266:298211899626

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some version specific code that can use virtual packages
author IBBoard <dev@ibboard.co.uk>
date Sun, 29 Dec 2019 16:58:25 +0000
parents bf2b8912c414
children edeedd13262c
files manifests/templates.pp modules/website/manifests/init.pp
diffstat 2 files changed, 0 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Sun Dec 29 16:48:04 2019 +0000
+++ b/manifests/templates.pp	Sun Dec 29 16:58:25 2019 +0000
@@ -648,16 +648,13 @@
 class devsite {
 	if versioncmp($operatingsystemrelease, '8') >= 0 {
 		# Apache::Mod doesn't map this correctly for CentOS 8 yet
-		$mod_wsgi_package = 'python3-mod_wsgi'
 		$mod_wsgi_lib = 'mod_wsgi_python3.so'
 	} else {
-		$mod_wsgi_package = 'mod_wsgi'
 		$mod_wsgi_lib = undef
 	}
 	apache::mod {
 		# mod_wsgi for Python support
 		'wsgi':
-		  package => $mod_wsgi_package,
 		  lib => $mod_wsgi_lib,
 	}
 
--- a/modules/website/manifests/init.pp	Sun Dec 29 16:48:04 2019 +0000
+++ b/modules/website/manifests/init.pp	Sun Dec 29 16:58:25 2019 +0000
@@ -136,13 +136,7 @@
       hour => '*/12',
       minute => '21',
     }
-    if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 {
-      $certbot_package = 'python3-certbot-apache'
-    } else {
-      $certbot_package = 'python2-certbot-apache'
-    }
     package { 'python-certbot-apache':
-      name => $certbot_package,
       ensure => installed,
     }
   }