[aur-dev] [PATCH v2 1/2] home: Add submitting packages section
Link to the ArchWiki and lists any SSH fingerprints configured in the AUR config file Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- Changes since v1: * Rephrase the section text mentioning AUR4 * Changed to use config_section_exists (do'h) * Rephrase ssh-fingerprints text * Fix type where I used <ul> instead of <li> * Use string concatenation and htmlspecialchars instead of interpolation web/html/home.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/web/html/home.php b/web/html/home.php index 6b54af3..58e84e0 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -71,6 +71,28 @@ html_header( __("Home") ); ?> </p> </div> + <h4><?= __('Submitting Packages') ?></h4> + <div class="article-content"> + <p> + <?php + echo __( + 'Git over SSH is now used to submit packages to the AUR. See the %sAUR4 section%s of the Arch User Repository ArchWiki page for more details.', + '<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">', + '</a>' + ); + ?> + </p> + <?php + if (config_section_exists('fingerprints')) { + echo __('The following SSH fingerprints are used for the AUR:') + echo '<ul>'; + foreach (config_items('fingerprints') as $type => $fingerprint) { + echo '<li><code>' . htmlspecialchars($type) '</code>: <code>' . htmlspecialchars($fingerprint) . '</code></li>'; + } + echo '</ul>'; + } + ?> + </div> <h4><?= __('Discussion') ?></h4> <div class="article-content"> <p> -- 2.4.2
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- conf/config.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/config.proto b/conf/config.proto index 628dac3..25c8830 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -31,6 +31,11 @@ snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 +[fingerprints] +Ed25519 = SHA256:HQ03dn6EasJHNDlt51KpQpFkT3yBX83x7BoIkA1iv2k +ECDSA = SHA256:L71Q91yHwmHPYYkJMDgj0xmUuw16qFOhJbBr1mzsiOI +RSA = SHA256:Ju+yWiMb/2O+gKQ9RJCDqvRg7l+Q95KFAeqM5sr6l2s + [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$ -- 2.4.2
On 14/06, Johannes Löthberg wrote:
. htmlspecialchars($type) '</code>: <code>'
Do'h, missing dot there. -- Sincerely, Johannes Löthberg PGP Key ID: 0x50FB9B273A9D0BB5 https://theos.kyriasis.com/~kyrias/
Link to the ArchWiki and lists any SSH fingerprints configured in the AUR config file Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- Fixed reference to AUR4 in the link web/html/home.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/web/html/home.php b/web/html/home.php index 6b54af3..c89a94f 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -71,6 +71,28 @@ html_header( __("Home") ); ?> </p> </div> + <h4><?= __('Submitting Packages') ?></h4> + <div class="article-content"> + <p> + <?php + echo __( + 'Git over SSH is now used to submit packages to the AUR. See the %sSubmitting Packages%s section of the Arch User Repository ArchWiki page for more details.', + '<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">', + '</a>' + ); + ?> + </p> + <?php + if (config_section_exists('fingerprints')) { + echo __('The following SSH fingerprints are used for the AUR:') + echo '<ul>'; + foreach (config_items('fingerprints') as $type => $fingerprint) { + echo '<li><code>' . htmlspecialchars($type) . '</code>: <code>' . htmlspecialchars($fingerprint) . '</code></li>'; + } + echo '</ul>'; + } + ?> + </div> <h4><?= __('Discussion') ?></h4> <div class="article-content"> <p> -- 2.4.2
participants (1)
-
Johannes Löthberg