maas-cert-server

Merge ~rodsmith/maas-cert-server:update-ppas into maas-cert-server:main

  1. Git
  2. lp:~rodsmith/maas-cert-server
  3. update-ppas
  4. Merge into main
Proposed by Rod Smith
Status: Merged
Approved by: Jeff Lane 
Approved revision: 91ca8298a18d3c1c7c6d97c034db3a1f128e8c58
Merged at revision: f00e7a2717ffe48cc15c8012dd5be42c5249cac4
Proposed branch: ~rodsmith/maas-cert-server:update-ppas
Merge into: maas-cert-server:main
Diff against target: 94 lines (+37/-29)
2 files modified
debian/changelog (+6/-0)
usr/sbin/maniacs-setup (+31/-29)
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+457171@code.launchpad.net

Commit message

Update maniacs-setup for new PPAs

Description of the change

Update maniacs-setup for new PPAs

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) :
review: Approve
Revision history for this message
Jeff Lane  (bladernr) wrote :

LGTM!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 167ae6e..ae73e81 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+maas-cert-server (0.7.8-0ppa1) jammy; urgency=medium
7+
8+ * Update maniacs-setup with new PPAs
9+
10+ -- Rod Smith <rodsmith@louiswu.rodsbooks.com> Fri, 08 Dec 2023 12:54:30 -0500
11+
12 maas-cert-server (0.7.7-0ppa1) jammy; urgency=medium
13
14 * Remove apt-key calls from certification preseed file
15diff --git a/usr/sbin/maniacs-setup b/usr/sbin/maniacs-setup
16index 4848fe3..150796f 100755
17--- a/usr/sbin/maniacs-setup
18+++ b/usr/sbin/maniacs-setup
19@@ -1110,22 +1110,23 @@ setup_repositories() {
20 echo "* Adding PPAs for the following architectures: $ARCHES"
21 echo "*"
22 # Make PPAs available for $ARCHES above
23- # Setup Hardware Certification PPA
24- echo "* Hardware Certification Stable PPA"
25- NAME='Hardware Certification - Stable'
26- URL='ppa:hardware-certification/public'
27+ # Setup Checkbox Stable PPA
28+ echo "* Checkbox Stable PPA"
29+ NAME='Checkbox-Dev / Stable'
30+ URL='ppa:checkbox-dev/stable'
31 KEY='-----BEGIN PGP PUBLIC KEY BLOCK-----
32-Version: SKS 1.1.6
33-Comment: Hostname: keyserver.ubuntu.com
34-
35-mI0ESXZUuwEEAM3g+uCxpkO8YqjQUSTdypoDiZEVkXeZfkJUz/enSTuWaGElZPGt/IxuTljb
36-3cNEnqKJTv4Ina+wY4T16Ya1Yw6nqgUj2v/371yN6/wQkJMJCQn7o7SAcSjT6I4IaPMiYxDs
37-Yq/b1v1Za5nL20ohblO1RgPdmPRf8OncmTpDIE/1ABEBAAG0MExhdW5jaHBhZCBQcml2YXRl
38-IFBQQSBmb3IgSGFyZHdhcmUgQ2VydGlmaWNhdGlvboi2BBMBAgAgBQJJdlS7AhsDBgsJCAcD
39-AgQVAggDBBYCAwECHgECF4AACgkQEBtYER/q3hDN0QQAxu5k0R9AmXxYUY88h5jS4gJkawMh
40-+rfIHmEosqwfQxFgz9/YzD+w8OCg90sVIzJK4LneQ3gbZQ6+T1Tib8yyqnl7OwY7GGdluXts
41-GsZVWOB3IQEZDOudR4jc7t4KdbWPAi2LzhOmmkDYiEsQ1dHum/XaaS1J78q3PVgfcJ6E5wM=
42-=yMG1
43+Comment: Hostname:
44+Version: Hockeypuck 2.1.0-258-gae6c1b3
45+
46+xo0ESZRIGAEEALihBkS1+WPsmLIq/y9i1Gc5vyPy7dqJVUscP38cjFsCnG8O+4Fe
47+P6mD/uJfVNBTcR3NjQ1jxwLISaIKndGu4J6n8xVPLWb/sesYy75WjgwUKC5lQnA6
48+1UElBm4AJfydKOobWTMq2X4Gw71+uwtjdnujn3uJGYDmrARHYCkAT7snABEBAAHN
49+JUxhdW5jaHBhZCBQUEEgZm9yIENoZWNrYm94IERldmVsb3BlcnPCtgQTAQIAIAUC
50+SZRIGAIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEBtLay0rvfK9XKAEAJqo
51+rKQxdRidJTxMEirFmhaVD9plAqO/5uNXYFsVU0kSEEsk5Ps4F4lvLqWoupbPHuha
52+6ngtNJf5HFNoCivFWSLawTA4tfF9RGuPozDHEpTbdLPqfpOKpFd1I9KMiGEhzCrQ
53+Dp8cYjZkdMDEPsO9A87S5BxpB9rwBj9cnYnpvbw5
54+=bG3o
55 -----END PGP PUBLIC KEY BLOCK-----'
56 ENABLED='true'
57 if [[ "$REPO_NAMES" =~ $NAME ]]; then
58@@ -1159,21 +1160,22 @@ qBVICuW5JINuTzBTAJepQjz2RgNhsC8/E95P2hWMjrQFtz4GsMBXdi2mxVNE4yVBjBpm2lvn
59
60
61 # Set up Dev PPA
62- echo "* Hardware Certification Development PPA (Disabled by default)"
63- NAME='Hardware Certification - Development'
64- URL='ppa:checkbox-dev/ppa'
65+ echo "* Checkbox Beta PPA (Disabled by default)"
66+ NAME='Checkbox Dev / Beta'
67+ URL='ppa:checkbox-dev/beta'
68 KEY='-----BEGIN PGP PUBLIC KEY BLOCK-----
69-Version: SKS 1.1.6
70-Comment: Hostname: keyserver.ubuntu.com
71-
72-mI0ESZRIGAEEALihBkS1+WPsmLIq/y9i1Gc5vyPy7dqJVUscP38cjFsCnG8O+4FeP6mD/uJf
73-VNBTcR3NjQ1jxwLISaIKndGu4J6n8xVPLWb/sesYy75WjgwUKC5lQnA61UElBm4AJfydKOob
74-WTMq2X4Gw71+uwtjdnujn3uJGYDmrARHYCkAT7snABEBAAG0JUxhdW5jaHBhZCBQUEEgZm9y
75-IENoZWNrYm94IERldmVsb3BlcnOItgQTAQIAIAUCSZRIGAIbAwYLCQgHAwIEFQIIAwQWAgMB
76-Ah4BAheAAAoJEBtLay0rvfK9XKAEAJqorKQxdRidJTxMEirFmhaVD9plAqO/5uNXYFsVU0kS
77-EEsk5Ps4F4lvLqWoupbPHuha6ngtNJf5HFNoCivFWSLawTA4tfF9RGuPozDHEpTbdLPqfpOK
78-pFd1I9KMiGEhzCrQDp8cYjZkdMDEPsO9A87S5BxpB9rwBj9cnYnpvbw5
79-=JBdy
80+Comment: Hostname:
81+Version: Hockeypuck 2.1.0-258-gae6c1b3
82+
83+xo0ESZRIGAEEALihBkS1+WPsmLIq/y9i1Gc5vyPy7dqJVUscP38cjFsCnG8O+4Fe
84+P6mD/uJfVNBTcR3NjQ1jxwLISaIKndGu4J6n8xVPLWb/sesYy75WjgwUKC5lQnA6
85+1UElBm4AJfydKOobWTMq2X4Gw71+uwtjdnujn3uJGYDmrARHYCkAT7snABEBAAHN
86+JUxhdW5jaHBhZCBQUEEgZm9yIENoZWNrYm94IERldmVsb3BlcnPCtgQTAQIAIAUC
87+SZRIGAIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEBtLay0rvfK9XKAEAJqo
88+rKQxdRidJTxMEirFmhaVD9plAqO/5uNXYFsVU0kSEEsk5Ps4F4lvLqWoupbPHuha
89+6ngtNJf5HFNoCivFWSLawTA4tfF9RGuPozDHEpTbdLPqfpOKpFd1I9KMiGEhzCrQ
90+Dp8cYjZkdMDEPsO9A87S5BxpB9rwBj9cnYnpvbw5
91+=bG3o
92 -----END PGP PUBLIC KEY BLOCK-----'
93 ENABLED='false'
94 if [[ "$REPO_NAMES" =~ $NAME ]]; then

Subscribers

People subscribed via source and target branches