From 9939e4d99399534193ba4d24c82d3de44f491204 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 9 Apr 2021 11:35:49 +0200 Subject: [PATCH 1/3] Deploy hubots from Gitea repos The repos have been moved over from GitHub. --- site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb | 2 +- site-cookbooks/kosmos-hubot/recipes/hal8000.rb | 2 +- site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb index a974cd4..423291c 100644 --- a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb +++ b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb @@ -43,7 +43,7 @@ application app_path do git do user app_user group app_group - repository "https://github.com/67P/botka.git" + repository "https://gitea.kosmos.org/kosmos/botka.git" revision "master" end diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb index b3c787e..96d4234 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb +++ b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb @@ -50,7 +50,7 @@ application hal8000_path do git do user "hubot" group "hubot" - repository "https://github.com/67P/hal8000.git" + repository "https://gitea.kosmos.org/kosmos/hal8000.git" revision "master" end diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb index c34d44e..04ce0ab 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb +++ b/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb @@ -56,7 +56,7 @@ application app_path do git do user app_user group app_group - repository "https://github.com/67P/hal8000.git" + repository "https://gitea.kosmos.org/kosmos/hal8000.git" revision "master" end -- 2.25.1 From 29e1d64ae00c156597bce9ab841f0cd263131b83 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 9 Apr 2021 11:44:36 +0200 Subject: [PATCH 2/3] Remove superfluous license headers from recipe files --- site-cookbooks/kosmos-hubot/recipes/_user.rb | 2 -- .../kosmos-hubot/recipes/botka_freenode.rb | 21 +------------------ .../kosmos-hubot/recipes/default.rb | 2 -- .../kosmos-hubot/recipes/hal8000.rb | 20 ------------------ .../kosmos-hubot/recipes/hal8000_xmpp.rb | 21 +------------------ 5 files changed, 2 insertions(+), 64 deletions(-) diff --git a/site-cookbooks/kosmos-hubot/recipes/_user.rb b/site-cookbooks/kosmos-hubot/recipes/_user.rb index d16d23d..3557dbc 100644 --- a/site-cookbooks/kosmos-hubot/recipes/_user.rb +++ b/site-cookbooks/kosmos-hubot/recipes/_user.rb @@ -2,8 +2,6 @@ # Cookbook Name:: kosmos-hubot # Recipe:: _user # -# Copyright 2019, Kosmos -# group "hubot" do gid 48268 diff --git a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb index 423291c..bb00c33 100644 --- a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb +++ b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb @@ -2,26 +2,7 @@ # Cookbook Name:: kosmos-hubot # Recipe:: botka_freenode # -# Copyright:: 2019, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# + app_name = "botka_freenode" app_path = "/opt/#{app_name}" app_user = "hubot" diff --git a/site-cookbooks/kosmos-hubot/recipes/default.rb b/site-cookbooks/kosmos-hubot/recipes/default.rb index 65bcf67..3a787b3 100644 --- a/site-cookbooks/kosmos-hubot/recipes/default.rb +++ b/site-cookbooks/kosmos-hubot/recipes/default.rb @@ -2,8 +2,6 @@ # Cookbook Name:: kosmos-hubot # Recipe:: default # -# Copyright 2017-2018, Kosmos -# include_recipe "kosmos-nodejs" include_recipe "kosmos-redis" diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb index 96d4234..b8d461d 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb +++ b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb @@ -2,26 +2,6 @@ # Cookbook Name:: kosmos-hubot # Recipe:: hal8000 # -# Copyright:: 2019, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# build_essential 'hal8000' do compile_time true diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb index 04ce0ab..15fbb3f 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb +++ b/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb @@ -2,26 +2,7 @@ # Cookbook Name:: kosmos-hubot # Recipe:: hal8000_xmpp # -# Copyright:: 2019, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# + app_name = "hal8000_xmpp" app_path = "/opt/#{app_name}" app_user = "hubot" -- 2.25.1 From c99f82fcd47c58d73e18b7b8c50e0b6bc28df388 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 9 Apr 2021 11:45:39 +0200 Subject: [PATCH 3/3] Update cookbook version --- site-cookbooks/kosmos-hubot/metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-hubot/metadata.rb b/site-cookbooks/kosmos-hubot/metadata.rb index 0bca208..a325be4 100644 --- a/site-cookbooks/kosmos-hubot/metadata.rb +++ b/site-cookbooks/kosmos-hubot/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'mail@kosmos.org' license 'MIT' description 'Configures Kosmos chat bots' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.2.0' depends 'kosmos-nodejs' depends 'kosmos-redis' -- 2.25.1