[aur-dev] [PATCH/RFC] 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: Lukas Fleischer <archlinux@cryptocrack.de> --- AUTHORS | 2 +- INSTALL | 4 +- README | 26 ++++++------ TRANSLATING | 32 +++++++-------- web/README | 104 ------------------------------------------------ web/html/css/aur.css | 74 ---------------------------------- web/html/css/aurweb.css | 75 ++++++++++++++++++++++++++++++++++ web/html/home.php | 4 +- web/html/index.php | 2 +- web/template/footer.php | 4 +- web/template/header.php | 2 +- 11 files changed, 113 insertions(+), 216 deletions(-) delete mode 100644 web/README delete mode 100644 web/html/css/aur.css create mode 100644 web/html/css/aurweb.css diff --git a/AUTHORS b/AUTHORS index 6581e81..582ccca 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,7 +7,7 @@ Current Maintainers Contributors ------------ -Use `git shortlog -s` for a list of AUR contributors. +Use `git shortlog -s` for a list of aurweb contributors. Translations ------------ diff --git a/INSTALL b/INSTALL index cbb9f44..62db77d 100644 --- a/INSTALL +++ b/INSTALL @@ -37,9 +37,9 @@ Setup on Arch Linux: Include conf/extra/httpd-vhosts.conf -4) Clone the AUR project (using the MYUSER from above) +4) Clone the aurweb project (using the MYUSER from above) $ cd - $ git clone git://projects.archlinux.org/aur.git + $ git clone git://projects.archlinux.org/aurweb.git 5) Configure PHP Make sure you have mysql and json enabled in PHP. diff --git a/README b/README index 6e7c414..fb3af67 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ -Arch User Repository (AUR) -========================== +aurweb +====== -The Arch User Repository (AUR) is a framework for hosting a collection of -packaging scripts that are created and submitted by the Arch community. The -scripts contained in the repository (PKGBUILDs) can be built using makepkg and -installed via the Arch package manager pacman. The AUR project aims to provide -the necessary web interface, database schema, and scripts for a multi-lingual -community-driven repository. +aurweb is a framework for hosting the Arch User Repository (AUR), a collection +of packaging scripts that are created and submitted by the Arch Linux +community. The scripts contained in the repository (PKGBUILDs) can be built +using makepkg and installed via the Arch Linux package manager pacman. The +aurweb project aims to provide the necessary web interface, database schema, +and scripts for a multi-lingual community-driven repository. Functionality ------------- @@ -25,7 +25,7 @@ Directory Layout ---------------- po:: - Translation files for strings in the AUR web interface. + Translation files for strings in the aurweb interface. scripts:: aurblup package blacklist tool. Scripts for AUR maintenance. @@ -42,9 +42,9 @@ Links * The official repository is hosted at git://projects.archlinux.org/aur.git -- 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 -* Questions, comments, and patches related to the AUR can be sent to the AUR - development mailing list: aur-dev@archlinux.org -- mailing list archives: - https://mailman.archlinux.org/mailman/listinfo/aur-dev +* Questions, comments, and patches related to aurweb can be sent to the aurweb + development mailing list: aurweb-dev@archlinux.org -- mailing list archives: + https://mailman.archlinux.org/mailman/listinfo/aurweb-dev diff --git a/TRANSLATING b/TRANSLATING index 27855f6..e450640 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -1,31 +1,31 @@ -AUR Translation -================ +aurweb Translation +================== -This document describes how to create and maintain AUR translations. It was -originally derived from https://wiki.archlinux.org/index.php/AUR_Translation +This document describes how to create and maintain aurweb translations. It was +originally derived from https://wiki.archlinux.org/index.php/aurweb_Translation -Creating an AUR translation requires a Transifex (http://www.transifex.com/) -account. You will need to register with a translation team on the AUR project -page (http://www.transifex.com/projects/p/aur/). +Creating an aurweb translation requires a Transifex (http://www.transifex.com/) +account. You will need to register with a translation team on the aurweb +project page (http://www.transifex.com/projects/p/aurweb/). Creating a New Translation ---------------------------- +-------------------------- 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 -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 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. -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 - initial translation file from our translation catalog: +2. Go into the "po/" directory in the aurweb source and run msginit(1) to + create a initial translation file from our translation catalog: $ cd aur-git $ git checkout master @@ -37,7 +37,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot $ 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. 6. Upload the newly created ".po" file to Transifex. If you don't like the web @@ -45,7 +45,7 @@ $ poedit <locale>.po Updating an Existing Translation ---------------------------------- +-------------------------------- 1. Download current translation files from Transifex. You can also do this using transifex-client which is available through the AUR: diff --git a/web/README b/web/README deleted file mode 100644 index 96aade5..0000000 --- a/web/README +++ /dev/null @@ -1,104 +0,0 @@ -============== -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. diff --git a/web/html/css/aur.css b/web/html/css/aur.css deleted file mode 100644 index 654116a..0000000 --- a/web/html/css/aur.css +++ /dev/null @@ -1,74 +0,0 @@ -/* AUR-specific customizations to "archweb.css". */ -#archnavbar.anb-aur ul li#anb-aur a { - color: white !important; -} - -#lang_sub { - float: right; -} - -.pkglist-nav .page { - margin: 0 .25em; -} - -#pkg-updates td.pkg-new { - padding: 0 .5em; -} - -#pkg-stats td.stat-desc { - white-space: normal; -} - -#actionlist form { - margin: 0; - padding: 0; -} - -.arch-bio-entry ul { - list-style: none; - padding: 0; -} - -#pkg-updates table { - table-layout: fixed; - width:100%; -} - -#pkg-updates td.pkg-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -#pkg-updates td.pkg-new { - width: 16px; -} - -#pkg-updates td.pkg-date { - text-align:right; -} - -.text-button { - background: transparent; - border: none !important; - margin: 0 !important; - padding: 0 !important; - font: normal 100% sans-serif; - text-decoration: none; - color: #07b; - cursor: pointer; -} - -.text-button:hover { - text-decoration: underline; - color: #666; -} - -.text-button::-moz-focus-inner { - padding: 0; - border: none; -} - -.comment-deleted { - color: #999; -} diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css new file mode 100644 index 0000000..551b3c7 --- /dev/null +++ b/web/html/css/aurweb.css @@ -0,0 +1,75 @@ +/* aurweb-specific customizations to archweb.css */ + +#archnavbar.anb-aur ul li#anb-aur a { + color: white !important; +} + +#lang_sub { + float: right; +} + +.pkglist-nav .page { + margin: 0 .25em; +} + +#pkg-updates td.pkg-new { + padding: 0 .5em; +} + +#pkg-stats td.stat-desc { + white-space: normal; +} + +#actionlist form { + margin: 0; + padding: 0; +} + +.arch-bio-entry ul { + list-style: none; + padding: 0; +} + +#pkg-updates table { + table-layout: fixed; + width:100%; +} + +#pkg-updates td.pkg-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +#pkg-updates td.pkg-new { + width: 16px; +} + +#pkg-updates td.pkg-date { + text-align:right; +} + +.text-button { + background: transparent; + border: none !important; + margin: 0 !important; + padding: 0 !important; + font: normal 100% sans-serif; + text-decoration: none; + color: #07b; + cursor: pointer; +} + +.text-button:hover { + text-decoration: underline; + color: #666; +} + +.text-button::-moz-focus-inner { + padding: 0; + border: none; +} + +.comment-deleted { + color: #999; +} diff --git a/web/html/home.php b/web/html/home.php index 556e21b..e075bb3 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -45,12 +45,12 @@ html_header( __("Home") ); <p> <?php 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 %saurweb-dev%s mailing list.', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>', '<var>', '</var>', - '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aurweb-dev">', '</a>' ); ?> diff --git a/web/html/index.php b/web/html/index.php index 95989f5..3e499ef 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -140,7 +140,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } else { switch ($path) { case "/css/archweb.css": - case "/css/aur.css": + case "/css/aurweb.css": case "/css/archnavbar/archnavbar.css": header("Content-Type: text/css"); readfile("./$path"); diff --git a/web/template/footer.php b/web/template/footer.php index 806d3be..1b451b3 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -3,9 +3,9 @@ <div id="footer"> <?php if ($ver): ?> - <p>AUR <?= htmlspecialchars($ver) ?></p> + <p>aurweb <?= htmlspecialchars($ver) ?></p> <?php endif; ?> - <p>Copyright © 2004-<?= date("Y") ?> AUR Development Team.</p> + <p>Copyright © 2004-<?= date("Y") ?> aurweb Development Team.</p> <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> diff --git a/web/template/header.php b/web/template/header.php index 6167fb7..8fa44f1 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -6,7 +6,7 @@ <head> <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title> <link rel='stylesheet' type='text/css' href='/css/archweb.css' /> - <link rel='stylesheet' type='text/css' href='/css/aur.css' /> + <link rel='stylesheet' type='text/css' href='/css/aurweb.css' /> <link rel='shortcut icon' href='/images/favicon.ico' /> <link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -- 2.2.2
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: Lukas Fleischer <archlinux@cryptocrack.de> --- Add some missing adjustments. Keep using the aur-dev mailing list for now. AUTHORS | 2 +- INSTALL | 20 +++---- README | 22 ++++---- TRANSLATING | 32 +++++------ conf/aur-sshd@.service | 2 +- conf/cgitrc.proto | 6 +-- conf/config.proto | 10 ++-- po/Makefile | 2 +- scripts/git-integration/sshd_config | 2 +- web/README | 104 ------------------------------------ web/html/404.php | 2 +- web/html/account.php | 2 +- web/html/addvote.php | 2 +- web/html/comaintainers.php | 2 +- web/html/css/aur.css | 78 --------------------------- web/html/css/aurweb.css | 79 +++++++++++++++++++++++++++ web/html/home.php | 4 +- web/html/index.php | 2 +- web/html/login.php | 2 +- web/html/packages.php | 2 +- web/html/passreset.php | 2 +- web/html/pkgbase.php | 2 +- web/html/pkgdel.php | 2 +- web/html/pkgmerge.php | 2 +- web/html/pkgreq.php | 2 +- web/html/tu.php | 2 +- web/html/voters.php | 2 +- web/lib/version.inc.php | 2 +- web/template/cgit/footer.html | 2 +- web/template/footer.php | 4 +- web/template/header.php | 2 +- web/template/template.phps | 2 +- 32 files changed, 150 insertions(+), 253 deletions(-) delete mode 100644 web/README delete mode 100644 web/html/css/aur.css create mode 100644 web/html/css/aurweb.css diff --git a/AUTHORS b/AUTHORS index 9011a3f..b1e4379 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,7 +17,7 @@ Past Maintainers Contributors ------------ -Use `git shortlog -s` for a list of AUR contributors. +Use `git shortlog -s` for a list of aurweb contributors. Translations ------------ diff --git a/INSTALL b/INSTALL index 7b90ffd..e6ef6ab 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Setup on Arch Linux 1) Clone the AUR project: $ 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 all URLs to /index.php/foo/bar/. The following block can be used with nginx: @@ -17,15 +17,15 @@ Setup on Arch Linux 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: - $ /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 $ cd openssh $ git checkout V_6_7_P1 @@ -36,7 +36,7 @@ Setup on Arch Linux 7) Create and edit the sshd configuration: - $ cd /srv/http/aur/ + $ cd /srv/http/aurweb/ $ umask 077 $ mkdir .ssh/ $ ssh-keygen -f .ssh/ssh_host_rsa_key -N '' -t rsa @@ -44,12 +44,12 @@ Setup on Arch Linux 8) Create a new user and change ownership of the .ssh directory: - # useradd -U -d /srv/http/aur -c 'AUR user' aur - # chown aur:aur /srv/http/aur/.ssh/ + # useradd -U -d /srv/http/aurweb -c 'AUR user' aur + # chown aur:aur /srv/http/aurweb/.ssh/ 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/aur/conf/aur-sshd@.service /etc/systemd/system/ + # cp /srv/http/aurweb/conf/aur-sshd.socket /etc/systemd/system/ + # cp /srv/http/aurweb/conf/aur-sshd@.service /etc/systemd/system/ # systemctl enable aur-sshd.socket # systemctl start aur-sshd.socket diff --git a/README b/README index 6e7c414..fac7fb2 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ -Arch User Repository (AUR) -========================== +aurweb +====== -The Arch User Repository (AUR) is a framework for hosting a collection of -packaging scripts that are created and submitted by the Arch community. The -scripts contained in the repository (PKGBUILDs) can be built using makepkg and -installed via the Arch package manager pacman. The AUR project aims to provide -the necessary web interface, database schema, and scripts for a multi-lingual -community-driven repository. +aurweb is a framework for hosting the Arch User Repository (AUR), a collection +of packaging scripts that are created and submitted by the Arch Linux +community. The scripts contained in the repository (PKGBUILDs) can be built +using makepkg and installed via the Arch Linux package manager pacman. The +aurweb project aims to provide the necessary web interface, database schema, +and scripts for a multi-lingual community-driven repository. Functionality ------------- @@ -25,7 +25,7 @@ Directory Layout ---------------- po:: - Translation files for strings in the AUR web interface. + Translation files for strings in the aurweb interface. scripts:: aurblup package blacklist tool. Scripts for AUR maintenance. @@ -42,9 +42,9 @@ Links * The official repository is hosted at git://projects.archlinux.org/aur.git -- 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 -* 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: https://mailman.archlinux.org/mailman/listinfo/aur-dev diff --git a/TRANSLATING b/TRANSLATING index 27855f6..e450640 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -1,31 +1,31 @@ -AUR Translation -================ +aurweb Translation +================== -This document describes how to create and maintain AUR translations. It was -originally derived from https://wiki.archlinux.org/index.php/AUR_Translation +This document describes how to create and maintain aurweb translations. It was +originally derived from https://wiki.archlinux.org/index.php/aurweb_Translation -Creating an AUR translation requires a Transifex (http://www.transifex.com/) -account. You will need to register with a translation team on the AUR project -page (http://www.transifex.com/projects/p/aur/). +Creating an aurweb translation requires a Transifex (http://www.transifex.com/) +account. You will need to register with a translation team on the aurweb +project page (http://www.transifex.com/projects/p/aurweb/). Creating a New Translation ---------------------------- +-------------------------- 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 -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 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. -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 - initial translation file from our translation catalog: +2. Go into the "po/" directory in the aurweb source and run msginit(1) to + create a initial translation file from our translation catalog: $ cd aur-git $ git checkout master @@ -37,7 +37,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot $ 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. 6. Upload the newly created ".po" file to Transifex. If you don't like the web @@ -45,7 +45,7 @@ $ poedit <locale>.po Updating an Existing Translation ---------------------------------- +-------------------------------- 1. Download current translation files from Transifex. You can also do this using transifex-client which is available through the AUR: diff --git a/conf/aur-sshd@.service b/conf/aur-sshd@.service index e29c292..5ec410a 100644 --- a/conf/aur-sshd@.service +++ b/conf/aur-sshd@.service @@ -2,7 +2,7 @@ Description=AUR OpenSSH Per-Connection Daemon [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 StandardInput=socket StandardError=syslog diff --git a/conf/cgitrc.proto b/conf/cgitrc.proto index e2b6892..86b410b 100644 --- a/conf/cgitrc.proto +++ b/conf/cgitrc.proto @@ -19,11 +19,11 @@ cache-static-ttl=60 root-title=AUR Package Repositories root-desc=Web interface to the AUR Package Repositories -header=/srv/http/aur/web/template/cgit/header.html -footer=/srv/http/aur/web/template/cgit/footer.html +header=/srv/http/aurweb/web/template/cgit/header.html +footer=/srv/http/aurweb/web/template/cgit/footer.html max-repodesc-length=50 max-blob-size=2048 max-stats=year enable-http-clone=1 -scan-path=/srv/http/aur/repos/ +scan-path=/srv/http/aurweb/repos/ diff --git a/conf/config.proto b/conf/config.proto index ac79bd6..b4a381d 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -29,18 +29,18 @@ auto_orphan_age = 15552000 [auth] 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]+$ -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 [serve] -repo-base = /srv/http/aur/repos/ +repo-base = /srv/http/aurweb/repos/ repo-regex = [a-z0-9][a-z0-9.+_-]*$ -template-path = /srv/http/aur/scripts/git-integration/templates/ -git-update-hook = /srv/http/aur/scripts/git-integration/git-update.py +template-path = /srv/http/aurweb/scripts/git-integration/templates/ +git-update-hook = /srv/http/aurweb/scripts/git-integration/git-update.py git-shell-cmd = /usr/bin/git-shell ssh-cmdline = ssh -p 2222 aur@aur.archlinux.org [aurblup] -db-path = /srv/http/aur/scripts/aurblup/ +db-path = /srv/http/aurweb/scripts/aurblup/ sync-dbs = core extra community multilib testing community-testing servers = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64 diff --git a/po/Makefile b/po/Makefile index e27e85b..1659f83 100644 --- a/po/Makefile +++ b/po/Makefile @@ -49,7 +49,7 @@ POTFILES: update-pot: POTFILES 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 \ --no-location --add-comments=TRANSLATORS: \ --package-name="$$pkgname" --package-version="$$pkgver" \ diff --git a/scripts/git-integration/sshd_config b/scripts/git-integration/sshd_config index fbe3578..64a45f8 100644 --- a/scripts/git-integration/sshd_config +++ b/scripts/git-integration/sshd_config @@ -2,5 +2,5 @@ Port 2222 HostKey ~/.ssh/ssh_host_rsa_key PasswordAuthentication 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 diff --git a/web/README b/web/README deleted file mode 100644 index 96aade5..0000000 --- a/web/README +++ /dev/null @@ -1,104 +0,0 @@ -============== -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. diff --git a/web/html/404.php b/web/html/404.php index 06ad683..a47ae1e 100644 --- a/web/html/404.php +++ b/web/html/404.php @@ -11,4 +11,4 @@ html_header( __("Page Not Found") ); </div> <?php -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/account.php b/web/html/account.php index 3dc8ef0..a4c630e 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -136,6 +136,6 @@ if (isset($_COOKIE["AURSID"])) { echo "</div>"; -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); ?> diff --git a/web/html/addvote.php b/web/html/addvote.php index 0b6b9c6..0372518 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -113,5 +113,5 @@ if (has_credential(CRED_TU_ADD_VOTE)) { print __("You are not allowed to access this area."); } -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/comaintainers.php b/web/html/comaintainers.php index 591fcad..23d8d19 100644 --- a/web/html/comaintainers.php +++ b/web/html/comaintainers.php @@ -16,6 +16,6 @@ if (!isset($base_id) || !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(p html_header(__("Manage Co-maintainers")); $users = pkgbase_get_comaintainers($base_id); include('comaintainers_form.php'); -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/css/aur.css b/web/html/css/aur.css deleted file mode 100644 index dfa6717..0000000 --- a/web/html/css/aur.css +++ /dev/null @@ -1,78 +0,0 @@ -/* AUR-specific customizations to "archweb.css". */ -#archnavbar.anb-aur ul li#anb-aur a { - color: white !important; -} - -#archnavbarlogo { - background: url('archnavbar/aurlogo.png') !important; -} - -#lang_sub { - float: right; -} - -.pkglist-nav .page { - margin: 0 .25em; -} - -#pkg-updates td.pkg-new { - padding: 0 .5em; -} - -#pkg-stats td.stat-desc { - white-space: normal; -} - -#actionlist form { - margin: 0; - padding: 0; -} - -.arch-bio-entry ul { - list-style: none; - padding: 0; -} - -#pkg-updates table { - table-layout: fixed; - width:100%; -} - -#pkg-updates td.pkg-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -#pkg-updates td.pkg-new { - width: 16px; -} - -#pkg-updates td.pkg-date { - text-align:right; -} - -.text-button { - background: transparent; - border: none !important; - margin: 0 !important; - padding: 0 !important; - font: normal 100% sans-serif; - text-decoration: none; - color: #07b; - cursor: pointer; -} - -.text-button:hover { - text-decoration: underline; - color: #666; -} - -.text-button::-moz-focus-inner { - padding: 0; - border: none; -} - -.comment-deleted { - color: #999; -} diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css new file mode 100644 index 0000000..79acce4 --- /dev/null +++ b/web/html/css/aurweb.css @@ -0,0 +1,79 @@ +/* aurweb-specific customizations to archweb.css */ + +#archnavbar.anb-aur ul li#anb-aur a { + color: white !important; +} + +#archnavbarlogo { + background: url('archnavbar/aurlogo.png') !important; +} + +#lang_sub { + float: right; +} + +.pkglist-nav .page { + margin: 0 .25em; +} + +#pkg-updates td.pkg-new { + padding: 0 .5em; +} + +#pkg-stats td.stat-desc { + white-space: normal; +} + +#actionlist form { + margin: 0; + padding: 0; +} + +.arch-bio-entry ul { + list-style: none; + padding: 0; +} + +#pkg-updates table { + table-layout: fixed; + width:100%; +} + +#pkg-updates td.pkg-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +#pkg-updates td.pkg-new { + width: 16px; +} + +#pkg-updates td.pkg-date { + text-align:right; +} + +.text-button { + background: transparent; + border: none !important; + margin: 0 !important; + padding: 0 !important; + font: normal 100% sans-serif; + text-decoration: none; + color: #07b; + cursor: pointer; +} + +.text-button:hover { + text-decoration: underline; + color: #666; +} + +.text-button::-moz-focus-inner { + padding: 0; + border: none; +} + +.comment-deleted { + color: #999; +} diff --git a/web/html/home.php b/web/html/home.php index 556e21b..031ad2b 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -45,7 +45,7 @@ html_header( __("Home") ); <p> <?php 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>', '<var>', @@ -129,4 +129,4 @@ $(document).ready(function() { }); </script> <?php -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/index.php b/web/html/index.php index cfd6598..fad1d2f 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -143,7 +143,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } else { switch ($path) { case "/css/archweb.css": - case "/css/aur.css": + case "/css/aurweb.css": case "/css/cgit.css": case "/css/archnavbar/archnavbar.css": header("Content-Type: text/css"); diff --git a/web/html/login.php b/web/html/login.php index 9818d04..94da559 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -53,4 +53,4 @@ html_header('AUR ' . __("Login")); <?php endif; ?> </div> <?php -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/packages.php b/web/html/packages.php index 645806e..76f7563 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -99,5 +99,5 @@ if (isset($pkgid)) { } } -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/passreset.php b/web/html/passreset.php index fecefe4..bc2eefc 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -109,4 +109,4 @@ html_header(__("Password Reset")); <?php -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 201749e..ef9b2c4 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -155,5 +155,5 @@ if (isset($_COOKIE["AURSID"])) { pkgbase_display_details($base_id, $details, null); } -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php index 41900e4..45a3ad4 100644 --- a/web/html/pkgdel.php +++ b/web/html/pkgdel.php @@ -45,4 +45,4 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> print __("Only Trusted Users and Developers can delete packages."); endif; -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index df97a2a..5fbdbd8 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -66,4 +66,4 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> print __("Only Trusted Users and Developers can merge packages."); endif; -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/pkgreq.php b/web/html/pkgreq.php index ccb0acd..1e671d0 100644 --- a/web/html/pkgreq.php +++ b/web/html/pkgreq.php @@ -80,5 +80,5 @@ if (isset($base_id)) { include('pkgreq_results.php'); } -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/tu.php b/web/html/tu.php index 158632a..cc77d62 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -121,5 +121,5 @@ else { header('Location: /'); } -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/html/voters.php b/web/html/voters.php index a40a9a1..8833be1 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -31,4 +31,4 @@ if (has_credential(CRED_PKGBASE_LIST_VOTERS)): <?php endif; -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); diff --git a/web/lib/version.inc.php b/web/lib/version.inc.php index 55caf6c..c4af783 100644 --- a/web/lib/version.inc.php +++ b/web/lib/version.inc.php @@ -1,3 +1,3 @@ <?php -define("AUR_VERSION", "v3.5.1"); +define("AURWEB_VERSION", "v3.5.1"); diff --git a/web/template/cgit/footer.html b/web/template/cgit/footer.html index f90aeb7..80481d9 100644 --- a/web/template/cgit/footer.html +++ b/web/template/cgit/footer.html @@ -1,6 +1,6 @@ <div id="footer"> <p> - Copyright © 2004-2014 AUR Development Team – + Copyright © 2004-2014 aurweb Development Team – <strong>Unsupported packages are user produced content. Any use of the provided files is at your own risk.</strong> </p> </div> diff --git a/web/template/footer.php b/web/template/footer.php index 806d3be..1b451b3 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -3,9 +3,9 @@ <div id="footer"> <?php if ($ver): ?> - <p>AUR <?= htmlspecialchars($ver) ?></p> + <p>aurweb <?= htmlspecialchars($ver) ?></p> <?php endif; ?> - <p>Copyright © 2004-<?= date("Y") ?> AUR Development Team.</p> + <p>Copyright © 2004-<?= date("Y") ?> aurweb Development Team.</p> <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> diff --git a/web/template/header.php b/web/template/header.php index 8a1494c..3567536 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -6,7 +6,7 @@ <head> <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title> <link rel='stylesheet' type='text/css' href='/css/archweb.css' /> - <link rel='stylesheet' type='text/css' href='/css/aur.css' /> + <link rel='stylesheet' type='text/css' href='/css/aurweb.css' /> <link rel='shortcut icon' href='/images/favicon.ico' /> <link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> diff --git a/web/template/template.phps b/web/template/template.phps index 841277b..4f8117c 100644 --- a/web/template/template.phps +++ b/web/template/template.phps @@ -16,5 +16,5 @@ html_header(); # print out the HTML header print __("Hi, this is worth reading!")."<br />\n"; -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); -- 2.2.2
participants (1)
-
Lukas Fleischer