From cc1e8aed3059c62d56bccfc07f3041901cec8ebb Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 30 Jan 2015 07:34:26 +0100 Subject: 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 --- 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 -o .po -i aur.pot $ poedit .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 .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") ); "; -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") );

', '', '', @@ -129,4 +129,4 @@ $(document).ready(function() { }); 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)):

- Copyright © 2004-2014 AUR Development Team – + Copyright © 2004-2014 aurweb Development Team – Unsupported packages are user produced content. Any use of the provided files is at your own risk.

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 @@ 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 @@ AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?> - + ' /> 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!")."
\n"; -html_footer(AUR_VERSION); +html_footer(AURWEB_VERSION); -- cgit v1.2.3-70-g09d2