/etc/repo_shell.cfg -> /etc/repo_shell.conf

diff --git a/README b/README
index 3271203ef4e31becbebacb022a15b4e69f1a0179..33cb71c7e92ebb2ea1f7497862962bce8a5487db 100644 (file)
--- a/README
+++ b/README
@@ -25,10 +25,10 @@ server, only using the git or subversion client side tools.
 Please build from a repository clone, as the make script uses
 'git describe --tags' to generate the resulting executable's version string.
 
-= Configure /etc/repo_shell.cfg
+= Configure /etc/repo_shell.conf
 
-The file /etc/repo_shell.cfg must contain certain fields as shown in the example
-below.  The spaces surrounding the equal sign ('=') are optional.
+The file /etc/repo_shell.conf must contain certain fields as shown in the
+example below.  The spaces surrounding the equal sign ('=') are optional.
 
     owner = repo
     svn_root = /var/lib/svn/repositories
@@ -134,7 +134,7 @@ both subversion and git repositories.
 
 Users interact with subversion and git repositories using what we somewhat
 incorrectly call access paths.  In both cases, the access path is relative to
-the respective repository type root, as defined in /etc/repo_shell.cfg.  In
+the respective repository type root, as defined in /etc/repo_shell.conf.  In
 other words, the user does not need to know where the repository is stored.  In
 the case of git, a repository can be under a subdirectory.  A couple of
 examples:

diff --git a/README.gitacls b/README.gitacls
index fc9315c4471b97420ed4f8703225117184f82490..5a44f276495d726dfcb03f697f5ee8dc2fb64308 100644 (file)
--- a/README.gitacls
+++ b/README.gitacls
@@ -1,5 +1,5 @@
 Git ACLs are defined in the git_acl_file, whose location is defined within the
-/etc/repo_shell.cfg configuration file.  This file is similar in passing to the
+/etc/repo_shell.conf configuration file.  This file is similar in passing to the
 Subversion authz.conf file format as defined in
 http://svnbook.red-bean.com/en/1.7/svn.serverconfig.pathbasedauthz.html.
 

diff --git a/repo_shell.c b/repo_shell.c
index 887c4d3430350c1025e32cc60066182ee92d49b4..2785b848a85f89af063f280c57a9003f8c7ac928 100644 (file)
--- a/repo_shell.c
+++ b/repo_shell.c
@@ -14,7 +14,7 @@
 #include "git_acl.h"
 #include "stringutils.h"
 
-#define CFG_FILE "/etc/repo_shell.cfg"
+#define CFG_FILE "/etc/repo_shell.conf"
 #define SHELL "/bin/bash"
 
 typedef struct {

diff --git a/scripts/gitcreate b/scripts/gitcreate
index 45e1d051115f974c35276e5928ec1d751b25ef55..16e80ec3b61699bcec8b6365c8483f7eaf795359 100755 (executable)
--- a/scripts/gitcreate
+++ b/scripts/gitcreate
@@ -1,9 +1,9 @@
 #!/bin/sh
 # gitcreate is part of the repo_shell distribution.
 
-eval $(sed -e 's| ||g' < /etc/repo_shell.cfg)
+eval $(sed -e 's| ||g' < /etc/repo_shell.conf)
 if [ -z "$owner" -o -z "$git_root" -o -z "$git_acl_file" ]; then
-    echo "$0: please configure /etc/repo_shell.cfg"
+    echo "$0: please configure /etc/repo_shell.conf"
 fi
 
 if [ "$(whoami)" != "$owner" ]; then

diff --git a/scripts/svncreate b/scripts/svncreate
index b696a2bdbf05d12cefc17a55e232ed55710c813d..2c0fb9eb0bdaa88694344db81795f126eceaff96 100755 (executable)
--- a/scripts/svncreate
+++ b/scripts/svncreate
@@ -2,9 +2,9 @@
 # svncreate is part of the repo_shell distribution.
 
 
-eval $(sed -e 's| ||g' < /etc/repo_shell.cfg)
+eval $(sed -e 's| ||g' < /etc/repo_shell.conf)
 if [ -z "$owner" -o -z "$svn_root" ]; then
-    echo "$0: please configure /etc/repo_shell.cfg"
+    echo "$0: please configure /etc/repo_shell.conf"
 fi
 svndir=$svn_root/..