[aur-dev] [PATCH] Changed 'Dutch' to 'Nederlands'

2012-12-07 Thread Marcel Korpel
AFAIK all languages are called in their own language. Only Dutch is in
English. Changing Dutch to Dutch.

---
 web/lib/translator.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php
index 2093cf7..1477b17 100644
--- a/web/lib/translator.inc.php
+++ b/web/lib/translator.inc.php
@@ -33,7 +33,7 @@ $SUPPORTED_LANGS = array(
hu = Magyar,
it = Italiano,
nb = Norsk,
-   nl = Dutch,
+   nl = Nederlands,
pl = Polski,
pt_BR = Português (Brasil),
pt_PT = Português (Portugal),
-- 
1.8.0.1


Re: [aur-dev] [PATCH] INSTALL: Change # to $ where possible

2012-12-07 Thread canyonknight
On Wed, Dec 5, 2012 at 11:49 AM, Marcel Korpel marcel.li...@gmail.com wrote:
 This overrides my earlier patch
 'INSTALL: Added MYUSER (needed from root)'
 ---

For future reference, anything above this is a part of the commit
message. Anything put here isn't. Since that other patch wasn't
applied, the above text isn't needed.

  INSTALL | 18 +-
  1 file changed, 9 insertions(+), 9 deletions(-)

 diff --git a/INSTALL b/INSTALL
 index 91aa3da..76df42b 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -57,24 +57,24 @@ Setup on Arch Linux:
 # mysqladmin -p create AUR

   - Connect to the mysql client
 -   # mysql -uroot -p AUR
 +   $ mysql -uroot -p AUR

   - Issue the following commands to the mysql client
 mysql GRANT ALL PRIVILEGES ON AUR.* to aur@localhost
 - identified by 'aur';
 +   - identified by 'aur';
 mysql FLUSH PRIVILEGES;
 mysql quit

   - Load the schema file
 -   # mysql -uaur -p AUR  ~/aur/support/schema/aur-schema.sql
 +   $ mysql -uaur -p AUR  ~/aur/support/schema/aur-schema.sql
 (give password 'aur' at the prompt)

   - Optionally load some test data for development purposes.
 # pacman -S words fortune-mod
 -   # cd ~/aur/support/schema/
 -   # python gendummydata.py dummy-data.sql
 -   # bzip2 dummy-data.sql
 -   # bzcat dummy-data.sql.bz2 | mysql -uaur -p AUR
 +   $ cd ~/aur/support/schema/
 +   $ python gendummydata.py dummy-data.sql
 +   $ bzip2 dummy-data.sql
 +   $ bzcat dummy-data.sql.bz2 | mysql -uaur -p AUR
 (give password 'aur' at the prompt)

 If your test data consists of real people and real email addresses 
 consider
 @@ -83,7 +83,7 @@ Setup on Arch Linux:
 mysql UPDATE Users SET Email = RAND() * RAND();

  7) Copy the config.inc.php.proto file to config.inc.php. Modify as needed.
 -   # cd ~/aur/web/lib/
 -   # cp config.inc.php.proto config.inc.php
 +   $ cd ~/aur/web/lib/
 +   $ cp config.inc.php.proto config.inc.php

  8) Point your browser to http://aur
 --
 1.8.0.1


Re: [aur-dev] Some issues after installing AUR locally

2012-12-07 Thread canyonknight
On Thu, Dec 6, 2012 at 10:25 AM, Marcel Korpel marcel.li...@gmail.com wrote:
 On Wed, Dec 5, 2012 at 8:24 PM, canyonknight canyonkni...@gmail.com wrote:

snip

 You could also just set $USE_VIRTUAL_URLS to false and navigate using
 the legacy pages packages.php, account.php, etc... Although I would
 recommend using rewriting to get a closer match of how the actual AUR
 behaves now.

 Indeed. Shouldn't this .htaccess file be included in the AUR? Or in INSTALL?

No. An htaccess file shouldn't be part of the source tree. An example
rewrite rule in INSTALL would probably be good.

Regards,

Jason


[aur-dev] [PATCH] Added RewriteRule for Apache

2012-12-07 Thread Marcel Korpel
---
 INSTALL | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/INSTALL b/INSTALL
index d682eda..190bc0d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -89,4 +89,10 @@ Setup on Arch Linux:
$ cd ~/aur/web/lib/
$ cp config.inc.php.proto config.inc.php

+   In case you set $USE_VIRTUAL_URLS to true (default nowadays) you should add
+   a rewrite rule. For Apache, add this ~/aur/web/html/.htaccess:
+
+   RewriteEngine on
+   RewriteRule ^(?!index\.php/.*)(.*)$ /index.php/$1
+
 8) Point your browser to http://aur
-- 
1.8.0.1


Re: [aur-dev] [PATCH] systemd compatibility

2012-12-07 Thread Lukas Fleischer
On Tue, Dec 04, 2012 at 06:29:59PM +0100, Marcel Korpel wrote:
 ---
  INSTALL | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

Applied on maint -- thanks!

 diff --git a/INSTALL b/INSTALL
 index afab274..1a41066 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -53,7 +53,7 @@ Setup on Arch Linux:
 
  6) Configure MySQL
   - Start the MySQL service. Example:
 -   # /etc/rc.d/mysqld start
 +   # systemctl start mysqld
 
   - Create database
 # mysqladmin -p create AUR
 -- 
 1.8.0.1


Re: [aur-dev] [PATCH] INSTALL: Update required dummy data packages

2012-12-07 Thread Lukas Fleischer
On Tue, Dec 04, 2012 at 05:37:25PM -0500, canyonknight wrote:
 Signed-off-by: canyonknight canyonkni...@gmail.com
 ---
  INSTALL | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

Applied on maint -- thanks!

 diff --git a/INSTALL b/INSTALL
 index 1a41066..047cfc4 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -72,7 +72,7 @@ Setup on Arch Linux:
 (give password 'aur' at the prompt)
  
   - Optionally load some test data for development purposes.
 -   # pacman -S words mysql-python
 +   # pacman -S words fortune-mod
 # cd ~/aur/support/schema/
 # python gendummydata.py dummy-data.sql
 # bzip2 dummy-data.sql
 -- 
 1.8.0.1


Re: [aur-dev] [PATCH] INSTALL: Current PHP has JSON support without extension

2012-12-07 Thread Lukas Fleischer
On Wed, Dec 05, 2012 at 01:14:55PM +0100, Marcel Korpel wrote:
 ---
  INSTALL | 6 ++
  1 file changed, 2 insertions(+), 4 deletions(-)
 

Applied, thanks!

 diff --git a/INSTALL b/INSTALL
 index a26dce9..3bc25d8 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -44,12 +44,10 @@ Setup on Arch Linux:
  5) Configure PHP
 Make sure you have mysql and json enabled in PHP.
 
 - - Edit php.ini and uncomment/add these lines:
 + - Edit php.ini and uncomment/add this line:
 extension=pdo_mysql.so
 -   extension=json.so
 
 -   If those php extensions are separate packages on your system, install
 -   them.
 +   If this PHP extension is a separate package on your system, install it.
 
  6) Configure MySQL
   - Start the MySQL service. Example:
 -- 
 1.8.0.1


Re: [aur-dev] [PATCH] INSTALL: Change # to $ where possible

2012-12-07 Thread Lukas Fleischer
On Wed, Dec 05, 2012 at 05:49:46PM +0100, Marcel Korpel wrote:
 This overrides my earlier patch
 'INSTALL: Added MYUSER (needed from root)'
 ---
  INSTALL | 18 +-
  1 file changed, 9 insertions(+), 9 deletions(-)
 

Also applied without the comment on the original patch.

 diff --git a/INSTALL b/INSTALL
 index 91aa3da..76df42b 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -57,24 +57,24 @@ Setup on Arch Linux:
 # mysqladmin -p create AUR
 
   - Connect to the mysql client
 -   # mysql -uroot -p AUR
 +   $ mysql -uroot -p AUR
 
   - Issue the following commands to the mysql client
 mysql GRANT ALL PRIVILEGES ON AUR.* to aur@localhost
 - identified by 'aur';
 +   - identified by 'aur';
 mysql FLUSH PRIVILEGES;
 mysql quit
 
   - Load the schema file
 -   # mysql -uaur -p AUR  ~/aur/support/schema/aur-schema.sql
 +   $ mysql -uaur -p AUR  ~/aur/support/schema/aur-schema.sql
 (give password 'aur' at the prompt)
 
   - Optionally load some test data for development purposes.
 # pacman -S words fortune-mod
 -   # cd ~/aur/support/schema/
 -   # python gendummydata.py dummy-data.sql
 -   # bzip2 dummy-data.sql
 -   # bzcat dummy-data.sql.bz2 | mysql -uaur -p AUR
 +   $ cd ~/aur/support/schema/
 +   $ python gendummydata.py dummy-data.sql
 +   $ bzip2 dummy-data.sql
 +   $ bzcat dummy-data.sql.bz2 | mysql -uaur -p AUR
 (give password 'aur' at the prompt)
 
 If your test data consists of real people and real email addresses 
 consider
 @@ -83,7 +83,7 @@ Setup on Arch Linux:
 mysql UPDATE Users SET Email = RAND() * RAND();
 
  7) Copy the config.inc.php.proto file to config.inc.php. Modify as needed.
 -   # cd ~/aur/web/lib/
 -   # cp config.inc.php.proto config.inc.php
 +   $ cd ~/aur/web/lib/
 +   $ cp config.inc.php.proto config.inc.php
 
  8) Point your browser to http://aur
 -- 
 1.8.0.1


Re: [aur-dev] [PATCH] INSTALL: Allow access to home directory

2012-12-07 Thread Lukas Fleischer
On Thu, Dec 06, 2012 at 01:57:01PM +0100, Marcel Korpel wrote:
 On Wed, Dec 5, 2012 at 11:26 PM, canyonknight canyonkni...@gmail.com wrote:
  On Wed, Dec 5, 2012 at 12:05 PM, Marcel Korpel marcel.li...@gmail.com 
  wrote:
  ---
   INSTALL | 3 +++
   1 file changed, 3 insertions(+)
 
  diff --git a/INSTALL b/INSTALL
  index 76df42b..d682eda 100644
  --- a/INSTALL
  +++ b/INSTALL
  @@ -69,6 +69,9 @@ Setup on Arch Linux:
  $ mysql -uaur -p AUR  ~/aur/support/schema/aur-schema.sql
  (give password 'aur' at the prompt)
 
  + - Allow access to home directory (otherwise you'll get a 403 Forbidden 
  error)
  +   $ chmod o+x $HOME
  +
- Optionally load some test data for development purposes.
  # pacman -S words fortune-mod
  $ cd ~/aur/support/schema/
  --
  1.8.0.1
 
  Not a fan of this. It's better to just make a note for the user to
  check that all their permissions are setup correctly.
 
 I'm also not a fan of setting world access to my home directory, but
 this was the solution that popped up after a Google search. I think a
 note about permissions being setup correctly is just too summarily:
 what does correctly mean in this case? A user still has to Google why
 they get a 403. Or is a better solution available to grant Apache
 access to a directory in the home dir?

I'm with canyonknight on this one. Changing the group of the AUR tree to
what your HTTP/FastCGI server uses is probably the easiest right way
to do this, but since permissions pretty much depend on your setup and
since this isn't anything AUR-specific, I think we should not add
anything detailed...

 
 Regards, Marcel


Re: [aur-dev] [PATCH] Added RewriteRule for Apache

2012-12-07 Thread Lukas Fleischer
On Fri, Dec 07, 2012 at 10:54:48PM +0100, Marcel Korpel wrote:
 ---
  INSTALL | 6 ++
  1 file changed, 6 insertions(+)
 
 diff --git a/INSTALL b/INSTALL
 index d682eda..190bc0d 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -89,4 +89,10 @@ Setup on Arch Linux:
 $ cd ~/aur/web/lib/
 $ cp config.inc.php.proto config.inc.php
 
 +   In case you set $USE_VIRTUAL_URLS to true (default nowadays) you should 
 add
 +   a rewrite rule. For Apache, add this ~/aur/web/html/.htaccess:
 +
 +   RewriteEngine on
 +   RewriteRule ^(?!index\.php/.*)(.*)$ /index.php/$1

Can't we use something like RewriteRule ^(.*)$ /index.php/$1 [L] here?
Under lighttpd, following config works:

url.rewrite-once = (
^(.*)$ = /index.php/$1
)

On alderaan, following nginx rule is used:

location ~ .* {
rewrite ^/(.*)$ /index.php/$1 last;
}

 +
  8) Point your browser to http://aur
 -- 
 1.8.0.1