Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emmapeel
puppet-tails
Commits
f53f0753
Commit
f53f0753
authored
Jul 23, 2020
by
Zen Fu
Browse files
Cleanup after GitLab migration (#72)
See:
https://salsa.debian.org/tails-team/gitlab-migration/-/issues/72
parent
d5212fc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
manifests/gitolite/hooks/tails.pp
View file @
f53f0753
...
@@ -10,11 +10,6 @@ class tails::gitolite::hooks::tails () inherits tails::website::params {
...
@@ -10,11 +10,6 @@ class tails::gitolite::hooks::tails () inherits tails::website::params {
group
=>
gitolite3
,
group
=>
gitolite3
,
}
}
# TODO: remove after applied for the first time.
file
{
"
${hooks_directory}
/pre-receive"
:
ensure
=>
absent
,
}
file
{
"
${hooks_directory}
/post-receive"
:
file
{
"
${hooks_directory}
/post-receive"
:
content
=>
template
(
'tails/gitolite/hooks/tails-post-receive.erb'
),
content
=>
template
(
'tails/gitolite/hooks/tails-post-receive.erb'
),
owner
=>
root
,
owner
=>
root
,
...
@@ -23,16 +18,6 @@ class tails::gitolite::hooks::tails () inherits tails::website::params {
...
@@ -23,16 +18,6 @@ class tails::gitolite::hooks::tails () inherits tails::website::params {
require
=>
Package
[
curl
],
require
=>
Package
[
curl
],
}
}
# TODO: remove after deploy
file
{
"
${hooks_directory}
/update.secondary"
:
ensure
=>
absent
,
}
# TODO: remove after deploy
file
{
"
${hooks_directory}
/langs.json"
:
ensure
=>
absent
,
}
ensure_packages
([
'curl'
])
ensure_packages
([
'curl'
])
}
}
manifests/jenkins/slave/iso_builder.pp
View file @
f53f0753
...
@@ -54,11 +54,6 @@ class tails::jenkins::slave::iso_builder () {
...
@@ -54,11 +54,6 @@ class tails::jenkins::slave::iso_builder () {
### Email notifications
### Email notifications
# TODO: remove once deployed
package
{
'python3-redmine'
:
ensure
=>
absent
,
}
ensure_packages
([
ensure_packages
([
'python3-requests'
,
'python3-requests'
,
'python3-sh'
,
'python3-sh'
,
...
@@ -78,11 +73,6 @@ class tails::jenkins::slave::iso_builder () {
...
@@ -78,11 +73,6 @@ class tails::jenkins::slave::iso_builder () {
],
],
}
}
# TODO: remove once deployed
file
{
'/etc/jenkins/redmine_apikey'
:
ensure
=>
absent
,
}
file
{
'/etc/jenkins/gitlab_apikey'
:
file
{
'/etc/jenkins/gitlab_apikey'
:
ensure
=>
present
,
ensure
=>
present
,
source
=>
'puppet:///modules/tails_secrets_jenkins/jenkins/slaves/isobuilders/gitlab/gitlab_apikey'
,
source
=>
'puppet:///modules/tails_secrets_jenkins/jenkins/slaves/isobuilders/gitlab/gitlab_apikey'
,
...
...
manifests/weblate/repositories.pp
View file @
f53f0753
...
@@ -42,7 +42,6 @@ class tails::weblate::repositories(
...
@@ -42,7 +42,6 @@ class tails::weblate::repositories(
vcsrepo
{
"
${mutable_data_dir}
/repositories/integration"
:
vcsrepo
{
"
${mutable_data_dir}
/repositories/integration"
:
ensure
=>
present
,
ensure
=>
present
,
force
=>
true
,
# needed when URL of a remote changes -- TODO: remove after deploy
provider
=>
git
,
provider
=>
git
,
remote
=>
'origin'
,
remote
=>
'origin'
,
user
=>
weblate
,
user
=>
weblate
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment