Drift/issues
17
1
Issues 181 Wiki Activity

Document git shenanigans with salt on sleipner #275

New Issue
Open
opened 2026-01-14 08:37:33 +01:00 by oysteikt · 1 comment
oysteikt commented 2026-01-14 08:37:33 +01:00
Owner
Copy Link

There is some crazy stuff going on with the salt git repo on sleipner. AFAIK, there is:

  • Your local checkout in your home dir
  • The bare repo in `/local/adm/git/salt.git
  • A worktree of the bare repo, located in /local/adm/salt-gitea-sync with it's cronjob script and ssh keys
  • Another checkout at /srv/salt, there is a post-receive hook in /local/adm/git/salt.git to have this pull master whenever someone pushes?
  • This same hook also tries to have this checkout rsynced over to /root/public_salt_states_repo
  • This one complains for some reason, and it might have to do with its broken .git directory

What's going on 👀

This goes for pillar too ofc

It would be great if we could have a note about how you should go about fixing the system whenever you amend and forcepush and then cause a conflict in /srv/salt (or whether to ban amends altogether) in this documentation

There is some crazy stuff going on with the salt git repo on sleipner. AFAIK, there is: - Your local checkout in your home dir - The bare repo in `/local/adm/git/salt.git - A worktree of the bare repo, located in `/local/adm/salt-gitea-sync` with it's cronjob script and ssh keys - Another checkout at `/srv/salt`, there is a post-receive hook in `/local/adm/git/salt.git` to have this pull master whenever someone pushes? - This same hook also tries to have this checkout rsynced over to `/root/public_salt_states_repo` - This one complains for some reason, and it might have to do with its broken `.git` directory What's going on 👀 This goes for pillar too ofc It would be great if we could have a note about how you should go about fixing the system whenever you amend and forcepush and then cause a conflict in `/srv/salt` (or whether to ban amends altogether) in this documentation
oysteikt added the documentation label 2026-01-14 08:37:33 +01:00
oysteikt added this to the Kanban project 2026-01-14 08:37:33 +01:00
oysteikt commented 2026-01-14 10:28:21 +01:00
Author
Owner
Copy Link

See also #86

See also #86
oysteikt moved this to Medium priority in Kanban on 2026-01-14 10:29:53 +01:00
felixalb reopened this issue 2026-01-14 22:57:44 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
dns
Involves modifications to dvask
 exploration
See the galaxy!
 gitea
mail
epost nord
 new stuff
Adds a new service / new functionality
 openstack
NUTN OpenStack, more like closed stack
 services
Everything regarding selfhosted services
 software
Everything regarding homebrewn software
art
The issue needs someone to be creative
 backup
big
No, not bug, **big** - this is gonna take a while
 blocked
This issue/PR depends on one or more other issues/PRs
 bug
Something is not working, and it's not the shield hero
 crash report
Report an oopsie
 disputed
kranglefanter
 documentation
Documentation changes required
 duplicate
This issue or pull request already exists
 enhancement
New feature
 good first issue
Get your hands dirty with a new project here
 logging
networking
TTM4100
 nixos
Requires changes to our nixos setup
 question
More information is needed
 salt
Requires changes to our salt setup
 security
Skommel
 servers n' hardware
Regards hardware, servers or VMs
 wontfix
This won't be fixed
No Label documentation
Milestone
No items
No Milestone
Projects
Clear projects
No project Kanban
Assignees
Clear assignees
adriangl albertba alfhj bjornoka chrisfjo chrivi danio davidk dungby eirikwit felixalb frero jonmro jovre karolds knuta krisleri larshhan olived oysteikt pederbs root torsteno vegardbm yorinad
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Drift/issues#275
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?