jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400565 )
Change subject: [puppet] Manage mailman with librarian-puppet ...................................................................... [puppet] Manage mailman with librarian-puppet As a bonus make test now passes without any errors. Change-Id: I8425d20ca37050e47f3a6607cfed5953985a89ce --- D .gitmodules D puppet/.gitmodules M puppet/Puppetfile M puppet/Puppetfile.lock D puppet/modules/mailman 5 files changed, 3 insertions(+), 34 deletions(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1822057..0000000 --- a/.gitmodules +++ /dev/null @@ -1,33 +0,0 @@ -[submodule "puppet/modules/elasticsearch"] - path = puppet/modules/elasticsearch - url = https://github.com/elastic/puppet-elasticsearch.git -[submodule "puppet/modules/stdlib"] - path = puppet/modules/stdlib - url = https://github.com/puppetlabs/puppetlabs-stdlib -[submodule "puppet/modules/apt"] - path = puppet/modules/apt - url = https://github.com/puppetlabs/puppetlabs-apt.git -[submodule "puppet/modules/mysql"] - path = puppet/modules/mysql - url = https://github.com/puppetlabs/puppetlabs-mysql.git -[submodule "puppet/modules/puppi"] - path = puppet/modules/puppi - url = https://github.com/example42/puppi.git -[submodule "puppet/modules/exim"] - path = puppet/modules/exim - url = https://github.com/example42/puppet-exim.git -[submodule "puppet/modules/mailman"] - path = puppet/modules/mailman - url = https://github.com/cjsoftuk/puppet-mailman.git -[submodule "puppet/modules/sysctl"] - path = puppet/modules/sysctl - url = https://github.com/thias/puppet-sysctl -[submodule "puppet/modules/git"] - path = puppet/modules/git - url = https://github.com/puppetlabs/puppetlabs-git.git -[submodule "puppet/modules/java"] - path = puppet/modules/java - url = https://github.com/puppetlabs/puppetlabs-java.git -[submodule "puppet/modules/datacat"] - path = puppet/modules/datacat - url = https://github.com/richardc/puppet-datacat.git diff --git a/puppet/.gitmodules b/puppet/.gitmodules deleted file mode 100644 index e69de29..0000000 --- a/puppet/.gitmodules +++ /dev/null diff --git a/puppet/Puppetfile b/puppet/Puppetfile index 0064830..089a028 100644 --- a/puppet/Puppetfile +++ b/puppet/Puppetfile @@ -5,3 +5,4 @@ mod 'thias-sysctl', '1.0.6' mod 'puppetlabs-java', '2.3.0' mod 'puppet-letsencrypt', '2.1.0' +mod 'thias-mailman', '0.1.4' diff --git a/puppet/Puppetfile.lock b/puppet/Puppetfile.lock index f2e1d4d..2a328be 100644 --- a/puppet/Puppetfile.lock +++ b/puppet/Puppetfile.lock @@ -29,6 +29,7 @@ richardc-datacat (0.6.2) stahnma-epel (1.3.0) puppetlabs-stdlib (>= 3.0.0) + thias-mailman (0.1.4) thias-sysctl (1.0.6) DEPENDENCIES @@ -36,5 +37,6 @@ puppet-letsencrypt (= 2.1.0) puppetlabs-java (= 2.3.0) puppetlabs-mysql (= 5.1.0) + thias-mailman (= 0.1.4) thias-sysctl (= 1.0.6) diff --git a/puppet/modules/mailman b/puppet/modules/mailman deleted file mode 160000 index d4f880f..0000000 --- a/puppet/modules/mailman +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d4f880fee47376e0eb8df8e6cfd432f547c7b7bb -- To view, visit https://gerrit.wikimedia.org/r/400565 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8425d20ca37050e47f3a6607cfed5953985a89ce Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
