X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Fpackages.pp;h=431225664737a65331536ebc9e84b59197d9f235;hb=421d51cedb758b5a27a89b5c458562f9c279cbc3;hp=d5fc7922402b1cdb37a98f21e15a842133686f2d;hpb=b37efa5c3fe30796344d4c15f6495345b00d4abe;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/packages.pp b/modules/salsa/manifests/packages.pp
index d5fc79224..431225664 100644
--- a/modules/salsa/manifests/packages.pp
+++ b/modules/salsa/manifests/packages.pp
@@ -25,38 +25,36 @@ class salsa::packages inherits salsa {
 		'nodejs-legacy',
 		'pkg-config',
 		'python-docutils',
+		'python-requests',
+		'python3-requests',
+		'ruby-dev',
+		'ruby-sinatra',
+		'ruby-sinatra-contrib',
+		'ruby-mail',
+		'ruby-soap4r',
+		'thin',
 		'libpq-dev',
 		'zlib1g-dev'
 	]
 
 	ensure_packages($requirements, { ensure => 'installed' })
 
-#	file { "${salsa::home}/yarn":
-#		ensure => directory,
-#		owner  => $salsa::user,
-#		group  => $salsa::group,
-#		mode   => '0755',
-#	}
+	$mgmt_requirements = [
+		'ansible',
+		'python-hkdf',
+		'ruby-ldap',
+	]
+
+	ensure_packages($mgmt_requirements, { ensure => 'installed' })
+
+	$registrationapp_requirements = [
+		'libapache2-mod-wsgi-py3',
+		'libjs-bootstrap',
+		'python3',
+		'python3-flask',
+		'python3-flaskext.wtf',
+		'python3-oauthlib',
+	]
 
-#	archive { "yarn-${gitlab::yarnversion}.tar.gz":
-#		path         => "${gitlab::home}/yarn-${gitlab::yarnversion}.tar.gz",
-#		source       => "https://github.com/yarnpkg/yarn/releases/download/${gitlab::yarnversion}/yarn-${gitlab::yarnversionett}.tar.gz",
-#		extract      => true,
-#		extract_path => "${gitlab::params::home}/yarn",
-#		cleanup      => true,
-#		user         => $gitlab::user,
-#		group        => $gitlab::group,
-#		require      => File["${gitlab::home}/yarn"],
-#	}
-#	
-#	if $gitlab::source_manage {
-#		vcsrepo { "${gitlab::home}/gitlab":
-#			ensure   => present,
-#			provider => git,
-#			source   => 'https://github.com/gitlabhq/gitlabhq.git',
-#			revision => $gitlab::source_version,
-#			owner => $gitlab::user, 
-#			group => $gitlab::group
-#		}
-#	}
+	ensure_packages($registrationapp_requirements, { ensure => 'installed' })
 }