Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hshbase-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
hshbase-formula
Commits
441564ae
Commit
441564ae
authored
8 years ago
by
Jan Philipp Timme
Browse files
Options
Downloads
Patches
Plain Diff
Remove salt repository + key from apt state
parent
229134ba
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
hshbase/apt/files/SALTSTACK-GPG-KEY.pub
+0
-31
0 additions, 31 deletions
hshbase/apt/files/SALTSTACK-GPG-KEY.pub
hshbase/apt/files/salt.list
+0
-5
0 additions, 5 deletions
hshbase/apt/files/salt.list
hshbase/apt/init.sls
+0
-25
0 additions, 25 deletions
hshbase/apt/init.sls
with
0 additions
and
61 deletions
hshbase/apt/files/SALTSTACK-GPG-KEY.pub
deleted
100644 → 0
+
0
−
31
View file @
229134ba
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (GNU/Linux)
mQENBFOpvpgBCADkP656H41i8fpplEEB8IeLhugyC2rTEwwSclb8tQNYtUiGdna9
m38kb0OS2DDrEdtdQb2hWCnswxaAkUunb2qq18vd3dBvlnI+C4/xu5ksZZkRj+fW
tArNR18V+2jkwcG26m8AxIrT+m4M6/bgnSfHTBtT5adNfVcTHqiT1JtCbQcXmwVw
WbqS6v/LhcsBE//SHne4uBCK/GHxZHhQ5jz5h+3vWeV4gvxS3Xu6v1IlIpLDwUts
kT1DumfynYnnZmWTGc6SYyIFXTPJLtnoWDb9OBdWgZxXfHEcBsKGha+bXO+m2tHA
gNneN9i5f8oNxo5njrL8jkCckOpNpng18BKXABEBAAG0MlNhbHRTdGFjayBQYWNr
YWdpbmcgVGVhbSA8cGFja2FnaW5nQHNhbHRzdGFjay5jb20+iQE4BBMBAgAiBQJT
qb6YAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAOCKFJ3le/vhkqB/0Q
WzELZf4d87WApzolLG+zpsJKtt/ueXL1W1KA7JILhXB1uyvVORt8uA9FjmE083o1
yE66wCya7V8hjNn2lkLXboOUd1UTErlRg1GYbIt++VPscTxHxwpjDGxDB1/fiX2o
nK5SEpuj4IeIPJVE/uLNAwZyfX8DArLVJ5h8lknwiHlQLGlnOu9ulEAejwAKt9CU
4oYTszYM4xrbtjB/fR+mPnYh2fBoQO4d/NQiejIEyd9IEEMd/03AJQBuMux62tjA
/NwvQ9eqNgLw9NisFNHRWtP4jhAOsshv1WW+zPzu3ozoO+lLHixUIz7fqRk38q8Q
9oNR31KvrkSNrFbA3D89uQENBFOpvpgBCADJ79iH10AfAfpTBEQwa6vzUI3Eltqb
9aZ0xbZV8V/8pnuU7rqM7Z+nJgldibFk4gFG2bHCG1C5aEH/FmcOMvTKDhJSFQUx
uhgxttMArXm2c22OSy1hpsnVG68G32Nag/QFEJ++3hNnbyGZpHnPiYgej3FrerQJ
zv456wIsxRDMvJ1NZQB3twoCqwapC6FJE2hukSdWB5yCYpWlZJXBKzlYz/gwD/Fr
GL578WrLhKw3UvnJmlpqQaDKwmV2s7MsoZogC6wkHE92kGPG2GmoRD3ALjmCvN1E
PsIsQGnwpcXsRpYVCoW7e2nW4wUf7IkFZ94yOCmUq6WreWI4NggRcFC5ABEBAAGJ
AR8EGAECAAkFAlOpvpgCGwwACgkQDgihSd5Xv74/NggA08kEdBkiWWwJZUZEy7cK
WWcgjnRuOHd4rPeT+vQbOWGu6x4bxuVf9aTiYkf7ZjVF2lPn97EXOEGFWPZeZbH4
vdRFH9jMtP+rrLt6+3c9j0M8SIJYwBL1+CNpEC/BuHj/Ra/cmnG5ZNhYebm76h5f
T9iPW9fFww36FzFka4VPlvA4oB7ebBtquFg3sdQNU/MmTVV4jPFWXxh4oRDDR+8N
1bcPnbB11b5ary99F/mqr7RgQ+YFF0uKRE3SKa7a+6cIuHEZ7Za+zhPaQlzAOZlx
fuBmScum8uQTrEF5+Um5zkwC7EXTdH1co/+/V/fpOtxIg4XO4kcugZefVm5ERfVS
MA==
=dtMN
-----END PGP PUBLIC KEY BLOCK-----
This diff is collapsed.
Click to expand it.
hshbase/apt/files/salt.list
deleted
100644 → 0
+
0
−
5
View file @
229134ba
{% set os = grains['os'] -%}
{% set oscodename = grains['oscodename'] -%}
{% if os == 'Debian' %}
deb http://debian.saltstack.com/debian {{ oscodename }}-saltstack main
{% endif %}
This diff is collapsed.
Click to expand it.
hshbase/apt/init.sls
+
0
−
25
View file @
441564ae
...
...
@@ -16,29 +16,4 @@ hsh_apt_sources_list:
- mode: 644
- user: root
- group: root
{% if grains['os'] == 'Debian' and oscodename == 'jessie' %}
hsh_apt_sources_d_salt_jessie:
pkgrepo.managed:
- humanname: deb-saltstack
- name: deb http://repo.saltstack.com/apt/debian/latest {{ oscodename }} main
- file: /etc/apt/sources.list.d/saltstack.list
- gpgcheck: 1
- key_url: salt://hshbase/apt/files/SALTSTACK-GPG-KEY.pub
{% endif %}
{% if grains['os'] == 'Debian' and oscodename != 'jessie' %}
hsh_apt_sources_d_salt_not_jessie:
file.managed:
- name: /etc/apt/sources.list.d/salt.list
- source: salt://hshbase/apt/files/salt.list
- template: jinja
- mode: 644
- user: root
- group: root
{% endif %}
{% endif %}
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