Commit cc1e8aed authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Rename the AUR software to aurweb



Rename the project to help differentiate between the software providing
access to the Arch User Repository and the collection of source packages
itself.
Signed-off-by: default avatarLukas Fleischer <archlinux@cryptocrack.de>
parent a28d4f8e
...@@ -17,7 +17,7 @@ Past Maintainers ...@@ -17,7 +17,7 @@ Past Maintainers
Contributors Contributors
------------ ------------
Use `git shortlog -s` for a list of AUR contributors. Use `git shortlog -s` for a list of aurweb contributors.
Translations Translations
------------ ------------
......
...@@ -4,7 +4,7 @@ Setup on Arch Linux ...@@ -4,7 +4,7 @@ Setup on Arch Linux
1) Clone the AUR project: 1) Clone the AUR project:
$ cd /srv/http/ $ cd /srv/http/
$ git clone git://projects.archlinux.org/aur.git $ git clone git://projects.archlinux.org/aurweb.git
2) Setup a web server with PHP and MySQL. Configure the web server to redirect 2) Setup a web server with PHP and MySQL. Configure the web server to redirect
all URLs to /index.php/foo/bar/. The following block can be used with nginx: all URLs to /index.php/foo/bar/. The following block can be used with nginx:
...@@ -17,15 +17,15 @@ Setup on Arch Linux ...@@ -17,15 +17,15 @@ Setup on Arch Linux
4) Create a new MySQL database and a user and import the AUR SQL schema: 4) Create a new MySQL database and a user and import the AUR SQL schema:
$ mysql -uaur -p AUR </srv/http/aur/schema/aur-schema.sql $ mysql -uaur -p AUR </srv/http/aurweb/schema/aur-schema.sql
5) Generate templates for new Git repositories: 5) Generate templates for new Git repositories:
$ /srv/http/aur/scripts/git-integration/gen-templates.py $ /srv/http/aurweb/scripts/git-integration/gen-templates.py
6) Clone the OpenSSH project, apply the AUR sshd patch and run `make`: 6) Clone the OpenSSH project, apply the aurweb sshd patch and run `make`:
$ cd /srv/http/aur/ $ cd /srv/http/aurweb/
$ git clone git://anongit.mindrot.org/openssh.git $ git clone git://anongit.mindrot.org/openssh.git
$ cd openssh $ cd openssh
$ git checkout V_6_7_P1 $ git checkout V_6_7_P1
...@@ -36,7 +36,7 @@ Setup on Arch Linux ...@@ -36,7 +36,7 @@ Setup on Arch Linux
7) Create and edit the sshd configuration: 7) Create and edit the sshd configuration:
$ cd /srv/http/aur/ $ cd /srv/http/aurweb/
$ umask 077 $ umask 077
$ mkdir .ssh/ $ mkdir .ssh/
$ ssh-keygen -f .ssh/ssh_host_rsa_key -N '' -t rsa $ ssh-keygen -f .ssh/ssh_host_rsa_key -N '' -t rsa
...@@ -44,12 +44,12 @@ Setup on Arch Linux ...@@ -44,12 +44,12 @@ Setup on Arch Linux
8) Create a new user and change ownership of the .ssh directory: 8) Create a new user and change ownership of the .ssh directory:
# useradd -U -d /srv/http/aur -c 'AUR user' aur # useradd -U -d /srv/http/aurweb -c 'AUR user' aur
# chown aur:aur /srv/http/aur/.ssh/ # chown aur:aur /srv/http/aurweb/.ssh/
9) Add, enable and start systemd unit files for the new sshd: 9) Add, enable and start systemd unit files for the new sshd:
# cp /srv/http/aur/conf/aur-sshd.socket /etc/systemd/system/ # cp /srv/http/aurweb/conf/aur-sshd.socket /etc/systemd/system/
# cp /srv/http/aur/conf/aur-sshd@.service /etc/systemd/system/ # cp /srv/http/aurweb/conf/aur-sshd@.service /etc/systemd/system/
# systemctl enable aur-sshd.socket # systemctl enable aur-sshd.socket
# systemctl start aur-sshd.socket # systemctl start aur-sshd.socket
Arch User Repository (AUR) aurweb
========================== ======
The Arch User Repository (AUR) is a framework for hosting a collection of aurweb is a framework for hosting the Arch User Repository (AUR), a collection
packaging scripts that are created and submitted by the Arch community. The of packaging scripts that are created and submitted by the Arch Linux
scripts contained in the repository (PKGBUILDs) can be built using makepkg and community. The scripts contained in the repository (PKGBUILDs) can be built
installed via the Arch package manager pacman. The AUR project aims to provide using makepkg and installed via the Arch Linux package manager pacman. The
the necessary web interface, database schema, and scripts for a multi-lingual aurweb project aims to provide the necessary web interface, database schema,
community-driven repository. and scripts for a multi-lingual community-driven repository.
Functionality Functionality
------------- -------------
...@@ -25,7 +25,7 @@ Directory Layout ...@@ -25,7 +25,7 @@ Directory Layout
---------------- ----------------
po:: po::
Translation files for strings in the AUR web interface. Translation files for strings in the aurweb interface.
scripts:: scripts::
aurblup package blacklist tool. Scripts for AUR maintenance. aurblup package blacklist tool. Scripts for AUR maintenance.
...@@ -42,9 +42,9 @@ Links ...@@ -42,9 +42,9 @@ Links
* The official repository is hosted at git://projects.archlinux.org/aur.git -- * The official repository is hosted at git://projects.archlinux.org/aur.git --
see HACKING for information on submitting patches. see HACKING for information on submitting patches.
* Discovered bugs can be submitted to the AUR bug tracker: * Discovered bugs can be submitted to the aurweb bug tracker:
https://bugs.archlinux.org/index.php?project=2 https://bugs.archlinux.org/index.php?project=2
* Questions, comments, and patches related to the AUR can be sent to the AUR * Questions, comments, and patches related to aurweb can be sent to the aurweb
development mailing list: aur-dev@archlinux.org -- mailing list archives: development mailing list: aur-dev@archlinux.org -- mailing list archives:
https://mailman.archlinux.org/mailman/listinfo/aur-dev https://mailman.archlinux.org/mailman/listinfo/aur-dev
AUR Translation aurweb Translation
================ ==================
This document describes how to create and maintain AUR translations. It was This document describes how to create and maintain aurweb translations. It was
originally derived from https://wiki.archlinux.org/index.php/AUR_Translation originally derived from https://wiki.archlinux.org/index.php/aurweb_Translation
Creating an AUR translation requires a Transifex (http://www.transifex.com/) Creating an aurweb translation requires a Transifex (http://www.transifex.com/)
account. You will need to register with a translation team on the AUR project account. You will need to register with a translation team on the aurweb
page (http://www.transifex.com/projects/p/aur/). project page (http://www.transifex.com/projects/p/aurweb/).
Creating a New Translation Creating a New Translation
--------------------------- --------------------------
Before beginning, please sign up for an Transifex account and request the Before beginning, please sign up for an Transifex account and request the
addition of a new translation team for the AUR project. Also, please do not addition of a new translation team for the aurweb project. Also, please do not
translate if you are unwilling to maintain or find someone to maintain the translate if you are unwilling to maintain or find someone to maintain the
translation. This is due to the fact that the AUR is a rapidly evolving project translation. This is due to the fact that aurweb is a rapidly evolving project
and there are constantly new strings to be translated. If the translations get and there are constantly new strings to be translated. If the translations get
too out of sync with the released versions, there will be too many untranslated too out of sync with the released versions, there will be too many untranslated
strings for the translation to be usable, and it may have to be disabled. strings for the translation to be usable, and it may have to be disabled.
1. Check out the AUR source using git: 1. Check out the aurweb source using git:
$ git clone git://projects.archlinux.org/aur.git aur-git $ git clone git://projects.archlinux.org/aurweb.git aurweb-git
2. Go into the "po/" directory in the AUR source and run msginit(1) to create a 2. Go into the "po/" directory in the aurweb source and run msginit(1) to
initial translation file from our translation catalog: create a initial translation file from our translation catalog:
$ cd aur-git $ cd aur-git
$ git checkout master $ git checkout master
...@@ -37,7 +37,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot ...@@ -37,7 +37,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot
$ poedit <locale>.po $ poedit <locale>.po
5. If you have a working AUR setup, add a line for the new translation in 5. If you have a working aurweb setup, add a line for the new translation in
"web/lib/config.inc.php.proto" and test if everything looks right. "web/lib/config.inc.php.proto" and test if everything looks right.
6. Upload the newly created ".po" file to Transifex. If you don't like the web 6. Upload the newly created ".po" file to Transifex. If you don't like the web
...@@ -45,7 +45,7 @@ $ poedit <locale>.po ...@@ -45,7 +45,7 @@ $ poedit <locale>.po
Updating an Existing Translation Updating an Existing Translation
--------------------------------- --------------------------------
1. Download current translation files from Transifex. You can also do this 1. Download current translation files from Transifex. You can also do this
using transifex-client which is available through the AUR: using transifex-client which is available through the AUR:
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Description=AUR OpenSSH Per-Connection Daemon Description=AUR OpenSSH Per-Connection Daemon
[Service] [Service]
ExecStart=-/srv/http/aur/openssh/sshd -i -f /srv/http/aur/.ssh/sshd_config ExecStart=-/srv/http/aurweb/openssh/sshd -i -f /srv/http/aurweb/.ssh/sshd_config
User=aur User=aur
StandardInput=socket StandardInput=socket
StandardError=syslog StandardError=syslog
...@@ -19,11 +19,11 @@ cache-static-ttl=60 ...@@ -19,11 +19,11 @@ cache-static-ttl=60
root-title=AUR Package Repositories root-title=AUR Package Repositories
root-desc=Web interface to the AUR Package Repositories root-desc=Web interface to the AUR Package Repositories
header=/srv/http/aur/web/template/cgit/header.html header=/srv/http/aurweb/web/template/cgit/header.html
footer=/srv/http/aur/web/template/cgit/footer.html footer=/srv/http/aurweb/web/template/cgit/footer.html
max-repodesc-length=50 max-repodesc-length=50
max-blob-size=2048 max-blob-size=2048
max-stats=year max-stats=year
enable-http-clone=1 enable-http-clone=1
scan-path=/srv/http/aur/repos/ scan-path=/srv/http/aurweb/repos/
...@@ -29,18 +29,18 @@ auto_orphan_age = 15552000 ...@@ -29,18 +29,18 @@ auto_orphan_age = 15552000
[auth] [auth]
key-prefixes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 key-prefixes = 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]+$ username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
git-serve-cmd = /srv/http/aur/scripts/git-integration/git-serve.py git-serve-cmd = /srv/http/aurweb/scripts/git-integration/git-serve.py
ssh-options = no-port-forwarding,no-X11-forwarding,no-pty ssh-options = no-port-forwarding,no-X11-forwarding,no-pty
[serve] [serve]
repo-base = /srv/http/aur/repos/ repo-base = /srv/http/aurweb/repos/
repo-regex = [a-z0-9][a-z0-9.+_-]*$ repo-regex = [a-z0-9][a-z0-9.+_-]*$
template-path = /srv/http/aur/scripts/git-integration/templates/ template-path = /srv/http/aurweb/scripts/git-integration/templates/
git-update-hook = /srv/http/aur/scripts/git-integration/git-update.py git-update-hook = /srv/http/aurweb/scripts/git-integration/git-update.py
git-shell-cmd = /usr/bin/git-shell git-shell-cmd = /usr/bin/git-shell
ssh-cmdline = ssh -p 2222 aur@aur.archlinux.org ssh-cmdline = ssh -p 2222 aur@aur.archlinux.org
[aurblup] [aurblup]
db-path = /srv/http/aur/scripts/aurblup/ db-path = /srv/http/aurweb/scripts/aurblup/
sync-dbs = core extra community multilib testing community-testing sync-dbs = core extra community multilib testing community-testing
servers = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64 servers = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
...@@ -49,7 +49,7 @@ POTFILES: ...@@ -49,7 +49,7 @@ POTFILES:
update-pot: POTFILES update-pot: POTFILES
pkgname=AUR; \ pkgname=AUR; \
pkgver=`sed -n 's/.*"AUR_VERSION", "\(.*\)".*/\1/p' ../web/lib/version.inc.php`; \ pkgver=`sed -n 's/.*"AURWEB_VERSION", "\(.*\)".*/\1/p' ../web/lib/version.inc.php`; \
xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \ xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \
--no-location --add-comments=TRANSLATORS: \ --no-location --add-comments=TRANSLATORS: \
--package-name="$$pkgname" --package-version="$$pkgver" \ --package-name="$$pkgname" --package-version="$$pkgver" \
......
...@@ -2,5 +2,5 @@ Port 2222 ...@@ -2,5 +2,5 @@ Port 2222
HostKey ~/.ssh/ssh_host_rsa_key HostKey ~/.ssh/ssh_host_rsa_key
PasswordAuthentication no PasswordAuthentication no
UsePrivilegeSeparation no UsePrivilegeSeparation no
AuthorizedKeysCommand /srv/http/aur/scripts/git-integration/git-auth.py AuthorizedKeysCommand /srv/http/aurweb/scripts/git-integration/git-auth.py
AuthorizedKeysCommandUser aur AuthorizedKeysCommandUser aur
==============
AUR Web Interface
==============
Terms and Definitions:
================
AUR - Arch User Repository
Repository made up of a collection of build scripts that are
created and submitted by the Arch community.
TU - Trusted User
A user that can add binary packages to the [community]
repository and administer AUR.
[unsupported]
The collection of package build files hosted via the AUR website.
File Hierachy
=========
Directory Layout:
-------------------
./html - DocumentRoot for AUR, where the PHP scripts live.
./html/css - CSS for AUR appearance
./html/css/navbar - CSS for Arch navigation bar appearance
./html/images - Any AUR images live here.
./lib - Supporting PHP include files. Access denied to Apache.
./locale
./template - Where most of the html markup resides and minimal
amount of PHP scripting.
./template/stats
./html Files:
-------------
account.php -
PHP script to handle registering for a new account. It prompts
the visitor for account information: desired username, E-mail,
password, real name, IRC nick, and default language. The info is
recorded in the Users table.
A logged-in user can change any of their own account information. If a
TU or Developer is logged into the system, they can search for and
edit accounts. A TU can change an account to a TU or User account. A
Developer can also change an account to the Developer type. TUs and
Developers are able to suspend accounts. If an account is suspended,
all packages are orphaned (the MaintainerUID field in the Packages
table is set to NULL).
addvote.php -
A form to submit proposals relating to the AUR. Only accessible to TUs
and Developers. Can be used to vote on a potential new TU, or any
other proposal that needs a vote. Length of the vote can be specified.
index.php -
Main page for the AUR. Provides links to all other pages in the AUR.
Gives a brief synopsis of what the AUR is and where to go for more
information.
logout.php -
Logs out a logged-in user. Clears the session id from the Sessions
table and unsets the cookie.
packages.php -
Page used to search the package database. Supports searching by name,
category, maintainer, popularity, etc. Also provides the ability to go
to a package page which has specific information for that package.
A specific package page includes the name, description, votes, etc.
As well as the ability to perform actions on the packages, such as
flagging or leaving a comment on the package.
passreset.php -
A page for a user to enter their e-mail and receive a reset e-mail to
replace the forgotten password.
pkgsubmit.php -
Page for users to upload a new package. Only allows upload of a
tarball that has been compressed with gzip. Tarball must contain the
PKGBUILD, scriptlets, and any other files necessary to build the
package from source. The user can select a category for the package.
The page makes appropriate entries into the database for tracking the
newly added source package and associated information.
rpc.php -
A frontend for tools to obtain raw information from the AUR. Features
the ability to search for a package, return information on a package,
return information on multiple packages, and search for a specific
package maintainer. Functionality through HTTP GET.
rss.php -
Generates RDF Site Summary (RSS) feed with the latest packages updated
in the AUR. Lists most recent 20 packages. Includes package name, link
to package page, package description, time of update, source listing,
maintainer name.
tu.php -
Page only available to TUs and Developers. Shows ongoing votes for
proposals and past votes for proposals. Current votes can be voted on
with a "Yes" vote, "No" vote, or an "Abstain" vote. Developers and TUs
can only vote once. Cannot vote on a proposal about themselves.
voters.php -
Page only available to TUs and Developers. Shows list of users that
voted for a specific package. Each username links to the user's
account information page.
...@@ -11,4 +11,4 @@ html_header( __("Page Not Found") ); ...@@ -11,4 +11,4 @@ html_header( __("Page Not Found") );
</div> </div>
<?php <?php
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
...@@ -136,6 +136,6 @@ if (isset($_COOKIE["AURSID"])) { ...@@ -136,6 +136,6 @@ if (isset($_COOKIE["AURSID"])) {
echo "</div>"; echo "</div>";
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
?> ?>
...@@ -113,5 +113,5 @@ if (has_credential(CRED_TU_ADD_VOTE)) { ...@@ -113,5 +113,5 @@ if (has_credential(CRED_TU_ADD_VOTE)) {
print __("You are not allowed to access this area."); print __("You are not allowed to access this area.");
} }
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
...@@ -16,6 +16,6 @@ if (!isset($base_id) || !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(p ...@@ -16,6 +16,6 @@ if (!isset($base_id) || !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(p
html_header(__("Manage Co-maintainers")); html_header(__("Manage Co-maintainers"));
$users = pkgbase_get_comaintainers($base_id); $users = pkgbase_get_comaintainers($base_id);
include('comaintainers_form.php'); include('comaintainers_form.php');
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
/* AUR-specific customizations to "archweb.css". */ /* aurweb-specific customizations to archweb.css */
#archnavbar.anb-aur ul li#anb-aur a { #archnavbar.anb-aur ul li#anb-aur a {
color: white !important; color: white !important;
} }
......
...@@ -45,7 +45,7 @@ html_header( __("Home") ); ...@@ -45,7 +45,7 @@ html_header( __("Home") );
<p> <p>
<?php <?php
echo __( echo __(
'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR, use the %saur-dev%s mailing list.', 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.',
'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">',
'</a>', '</a>',
'<var>', '<var>',
...@@ -129,4 +129,4 @@ $(document).ready(function() { ...@@ -129,4 +129,4 @@ $(document).ready(function() {
}); });
</script> </script>
<?php <?php
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
...@@ -143,7 +143,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { ...@@ -143,7 +143,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
} else { } else {
switch ($path) { switch ($path) {
case "/css/archweb.css": case "/css/archweb.css":
case "/css/aur.css": case "/css/aurweb.css":
case "/css/cgit.css": case "/css/cgit.css":
case "/css/archnavbar/archnavbar.css": case "/css/archnavbar/archnavbar.css":
header("Content-Type: text/css"); header("Content-Type: text/css");
......
...@@ -53,4 +53,4 @@ html_header('AUR ' . __("Login")); ...@@ -53,4 +53,4 @@ html_header('AUR ' . __("Login"));
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php <?php
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
...@@ -99,5 +99,5 @@ if (isset($pkgid)) { ...@@ -99,5 +99,5 @@ if (isset($pkgid)) {
} }
} }
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
...@@ -109,4 +109,4 @@ html_header(__("Password Reset")); ...@@ -109,4 +109,4 @@ html_header(__("Password Reset"));
<?php <?php
html_footer(AUR_VERSION); html_footer(AURWEB_VERSION);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment