Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Wiki Replica
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
TPA
Wiki Replica
Commits
c99f5ee1
Verified
Commit
c99f5ee1
authored
2 years ago
by
anarcat
Browse files
Options
Downloads
Patches
Plain Diff
update puppet instructions to follow the new git url
parent
45de53fe
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
howto/puppet.md
+25
-20
25 additions, 20 deletions
howto/puppet.md
with
25 additions
and
20 deletions
howto/puppet.md
+
25
−
20
View file @
c99f5ee1
...
...
@@ -26,7 +26,7 @@ Here is how to make the change:
1.
To any change on the Puppet server, you will first need to clone
the git repository:
git clone
pauli
.torproject.org:/srv/puppet.torproject.org/git/tor-puppet
git clone
git@puppet
.torproject.org:/srv/puppet.torproject.org/git/tor-puppet
This needs to be only done once.
...
...
@@ -79,7 +79,7 @@ also confirm this tutorial is what is actually needed.
1.
To any change on the Puppet server, you will first need to clone
the git repository:
git clone
pauli
.torproject.org:/srv/puppet.torproject.org/git/tor-puppet
git clone
git@puppet
.torproject.org:/srv/puppet.torproject.org/git/tor-puppet
This needs to be only done once.
...
...
@@ -1091,30 +1091,35 @@ more information:
### Problems pushing to the Puppet server
Normally, when you push new commits to the Puppet server, a hook runs
and updates the working copy. But sometimes this fails with an error
like:
If you get this error when pushing commits to the Puppet server:
remote: error: unable to unlink old 'modules/ipsec/misc/config.yaml': Permission denied.
error: remote unpack failed: unable to create temporary object directory
The problem, in such cases, is that the files in the
`/etc/puppet/`
checkout are not writable by your user. It could also happen that the
repository itself (in
`/srv/puppet.torproject.org/git/tor-puppet`
)
could have permission issues.
... or, longer version:
This problem is described in
[
issue 29663
][]
and is due to someone
not pushing properly before you. To fix the permissions, try:
anarcat@curie:tor-puppet$ LANG=C git push
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 772 bytes | 772.00 KiB/s, done.
Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
error: remote unpack failed: unable to create temporary object directory
To puppet.torproject.org:/srv/puppet.torproject.org/git/tor-puppet
! [remote rejected] master -> master (unpacker error)
error: failed to push some refs to 'puppet.torproject.org:/srv/puppet.torproject.org/git/tor-puppet'
anarcat@curie:tor-puppet[1]$
sudo chown -R root:adm /etc/puppet
sudo chown :puppet /etc/puppet/secret
sudo chmod -R g+rw /etc/puppet
sudo chmod g-w /etc/puppet/secret
It's because you're not using the
`git`
role account. Update your
remote URL configuration to use
`git@puppet.torproject.org`
instead,
with:
[
issue 29663
]:
https://gitlab.torproject.org/tpo/tpa/team/-/issues/29663
git remote set-url origin git@puppet.torproject.org:/srv/puppet.torproject.org/git/tor-puppet.git
A similar recipe could be applied to the git repository, as
needed. Hopefully this will be resolved when we start deploying with a
role account instead.
This is because we have switched to a role user for pushing changes to
the Git repository, see
[
issue 29663
][]
for details.
[
issue 29663
]:
https://gitlab.torproject.org/tpo/tpa/team/-/issues/29663
### Puppet server CA renewal
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment