[aur-dev] [PATCH 1/2] home: Add submitting packages section
Links to ArchWiki and lists any SSH fingerprints configured in tho AUR config file Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- web/html/home.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/web/html/home.php b/web/html/home.php index 6b54af3..84df361 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 __( + 'From AUR 4 Git is used to submit packages to the AUR over SSH. 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_key_exists('fingerprints')) { + echo __('Following are the SSH fingerprints for the AUR:'); + echo '<ul>'; + foreach (config_items('fingerprints') as $type => $fingerprint) { + echo "<ul>$type: $fingerprint</ul>"; + } + 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 Sun, 14 Jun 2015 at 14:41:13, Johannes Löthberg wrote:
Links to ArchWiki and lists any SSH fingerprints configured in tho AUR
s/tho/the/
config file
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- web/html/home.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/web/html/home.php b/web/html/home.php index 6b54af3..84df361 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 __( + 'From AUR 4 Git is used to submit packages to the AUR over SSH. See the %sAUR4 section%s of the Arch User Repository ArchWiki page for more details.',
I'd rather not mention the AUR 4 section of the wiki here because that means we would have to change the string again when AUR 4.0.0 is released and all translations need to be amended. If we only change the link below, there is no extra work for translators.
+ '<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">', + '</a>' + ); + ?> + </p> + <?php + if (config_key_exists('fingerprints')) {
Needs to be changed if we rename config_key_exists() to config_section_exists(), see my comment on the other patch series.
+ echo __('Following are the SSH fingerprints for the AUR:');
I am not a native English speaker but isn't "The following" better than "Following" here?
+ echo '<ul>'; + foreach (config_items('fingerprints') as $type => $fingerprint) { + echo "<ul>$type: $fingerprint</ul>";
"<ul>"/"</ul>" should be "<li>"/"</li>" here. I think we should also wrap the type and the fingerprint in <code></code>. Also, please don't use string interpolation here and use htmlspecialchars() to escape the strings.
+ } + echo '</ul>'; + } + ?> + </div> <h4><?= __('Discussion') ?></h4> <div class="article-content"> <p> -- 2.4.2
Looks fine otherwise. Thanks a lot! Regards, Lukas
participants (2)
-
Johannes Löthberg
-
Lukas Fleischer