diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-23 00:06:30 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-11-23 01:05:43 -0500 |
commit | e3dfb09aec084fc6bd119309ce949eaab714eae7 (patch) | |
tree | adff790795bcf713dab31e7c537753a3c4cf62b8 | |
parent | 05bf00c441283bb4267e328bf463c83745fec22b (diff) |
Re-brand to clarify that the software is aurweb; the instance is the AUR.
-rw-r--r-- | INSTALL | 10 | ||||
-rw-r--r-- | schema/aur-schema.sql | 6 | ||||
-rwxr-xr-x | schema/gendummydata.py | 4 | ||||
-rw-r--r-- | web/html/account.php | 2 | ||||
-rw-r--r-- | web/html/logout.php | 4 | ||||
-rw-r--r-- | web/html/packages.php | 2 | ||||
-rw-r--r-- | web/html/passreset.php | 2 | ||||
-rw-r--r-- | web/html/register.php | 2 | ||||
-rw-r--r-- | web/lib/acctfuncs.inc.php | 4 | ||||
-rw-r--r-- | web/lib/aur.inc.php | 14 | ||||
-rw-r--r-- | web/lib/aurjson.class.php | 2 | ||||
-rw-r--r-- | web/lib/stats.inc.php | 2 | ||||
-rw-r--r-- | web/template/template.phps | 2 |
13 files changed, 28 insertions, 28 deletions
@@ -1,7 +1,7 @@ Setup on Arch Linux =================== -1) Clone the AUR project: +1) Clone the aurweb project: $ cd /srv/http/ $ git clone git://git.archlinux.org/aurweb.git @@ -33,9 +33,9 @@ Setup on Arch Linux 3) Copy conf/config.proto to /etc/aurweb/config and adjust the configuration (pay attention to disable_http_login, enable_maintenance and aur_location). -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 aurweb SQL schema: - $ mysql -uaur -p AUR </srv/http/aurweb/schema/aur-schema.sql + $ mysql -uaur -p </srv/http/aurweb/schema/aur-schema.sql 5) Install Python modules and dependencies: @@ -44,7 +44,7 @@ Setup on Arch Linux 6) Create a new user: - # useradd -U -d /srv/http/aurweb -c 'AUR user' aur + # useradd -U -d /srv/http/aurweb -c 'aurweb user' aur 7) Initialize the Git repository: @@ -57,7 +57,7 @@ Setup on Arch Linux # ln -s /usr/local/bin/aurweb-git-update hooks/update # chown -R aur . -8) Configure sshd(8) for the AUR. Add the following lines at the end of your +8) Configure sshd(8) for aurweb. Add the following lines at the end of your sshd_config(5) and restart the sshd. Note that OpenSSH 6.9 or newer is needed! diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 30209bd..1510e2d 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -1,11 +1,11 @@ --- The MySQL database layout for the AUR. Certain data +-- The MySQL database layout for aurweb. Certain data -- is also included such as AccountTypes, etc. -- DROP DATABASE IF EXISTS AUR; CREATE DATABASE AUR DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; USE AUR; --- Define the Account Types for the AUR. +-- Define the Account Types for aurweb. -- CREATE TABLE AccountTypes ( ID TINYINT UNSIGNED NOT NULL AUTO_INCREMENT, @@ -61,7 +61,7 @@ CREATE TABLE SSHPubKeys ( ) ENGINE = InnoDB; --- Track Users logging in/out of AUR web site. +-- Track Users logging in/out of aurweb. -- CREATE TABLE Sessions ( UsersID INTEGER UNSIGNED NOT NULL, diff --git a/schema/gendummydata.py b/schema/gendummydata.py index 9dd2f45..b5512c5 100755 --- a/schema/gendummydata.py +++ b/schema/gendummydata.py @@ -3,11 +3,11 @@ usage: gendummydata.py outputfilename.sql """ # -# This script seeds the AUR database with dummy data for +# This script seeds the aurweb database with dummy data for # use during development/testing. It uses random entries # from /usr/share/dict/words to create user accounts and # package names. It generates the SQL statements to -# insert these users/packages into the AUR database. +# insert these users/packages into the aurweb database. # import random import time diff --git a/web/html/account.php b/web/html/account.php index 2892f04..2ca8723 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once('aur.inc.php'); # access AUR common functions +include_once('aur.inc.php'); # access aurweb common functions include_once('acctfuncs.inc.php'); # access Account specific functions set_lang(); # this sets up the visitor's language diff --git a/web/html/logout.php b/web/html/logout.php index 5e8e8f4..d173773 100644 --- a/web/html/logout.php +++ b/web/html/logout.php @@ -2,8 +2,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc.php"); # access AUR common functions -include_once("acctfuncs.inc.php"); # access AUR common functions +include_once("aur.inc.php"); # access aurweb common functions +include_once("acctfuncs.inc.php"); # access aurweb common functions # if they've got a cookie, log them out - need to do this before diff --git a/web/html/packages.php b/web/html/packages.php index 1b89278..ed4b86a 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc.php"); # access AUR common functions +include_once("aur.inc.php"); # access aurweb common functions set_lang(); # this sets up the visitor's language include_once('pkgfuncs.inc.php'); # package specific functions check_sid(); # see if they're still logged in diff --git a/web/html/passreset.php b/web/html/passreset.php index cb2f6bc..ab766ba 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc.php"); # access AUR common functions +include_once("aur.inc.php"); # access aurweb common functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in diff --git a/web/html/register.php b/web/html/register.php index 6c6d52e..13b9ad5 100644 --- a/web/html/register.php +++ b/web/html/register.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once('aur.inc.php'); # access AUR common functions +include_once('aur.inc.php'); # access aurweb common functions include_once('acctfuncs.inc.php'); # access Account specific functions set_lang(); # this sets up the visitor's language diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 172b962..6bc6646 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -41,7 +41,7 @@ function html_format_pgp_fingerprint($fingerprint) { /** * Loads the account editing form, with any values that are already saved * - * @global array $SUPPORTED_LANGS Languages that are supported by the AUR + * @global array $SUPPORTED_LANGS Languages that are supported by the aurweb instance * @param string $A Form to use, either UpdateAccount or NewAccount * @param string $U The username to display * @param string $T The account type of the displayed user @@ -76,7 +76,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R="" /** * Process information given to new/edit account form * - * @global array $SUPPORTED_LANGS Languages that are supported by the AUR + * @global array $SUPPORTED_LANGS Languages that are supported by the aurweb instance * @param string $TYPE Either "edit" for editing or "new" for registering an account * @param string $A Form to use, either UpdateAccount or NewAccount * @param string $U The username for the account diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 9015ae8..ac51fb9 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -345,11 +345,11 @@ function uid_from_sid($sid="") { } /** - * Common AUR header displayed on all pages + * Common aurweb header displayed on all pages * * @global string $LANG Language selected by the visitor - * @global array $SUPPORTED_LANGS Languages that are supported by the AUR - * @param string $title Name of the AUR page to be displayed on browser + * @global array $SUPPORTED_LANGS Languages that are supported by the aurweb instance + * @param string $title Name of the aurweb page to be displayed on browser * * @return void */ @@ -362,9 +362,9 @@ function html_header($title="", $details=array()) { } /** - * Common AUR footer displayed on all pages + * Common aurweb footer displayed on all pages * - * @param string $ver The AUR version + * @param string $ver The aurweb version * * @return void */ @@ -702,9 +702,9 @@ function bound($n, $min, $max) { } /** - * Return the URL of the AUR root + * Return the URL of the aurweb root * - * @return string The URL of the AUR root + * @return string The URL of the aurweb root */ function aur_location() { $location = config_get('options', 'aur_location'); diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 3bd9179..e12d50d 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -3,7 +3,7 @@ include_once("aur.inc.php"); /* - * This class defines a remote interface for fetching data from the AUR using + * This class defines a remote interface for fetching data from aurweb using * JSON formatted elements. * * @package rpc diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 80619fe..49f6886 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -57,7 +57,7 @@ function user_table($userid) { * @return void */ function general_stats_table() { - # AUR statistics + # aurweb statistics $q = "SELECT COUNT(*) FROM PackageBases WHERE PackagerUID IS NOT NULL"; $pkg_count = db_cache_value($q, 'pkg_count'); diff --git a/web/template/template.phps b/web/template/template.phps index 4f8117c..c395c2a 100644 --- a/web/template/template.phps +++ b/web/template/template.phps @@ -4,7 +4,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include("aur.inc.php"); # access AUR common functions +include("aur.inc.php"); # access aurweb common functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in html_header(); # print out the HTML header |