You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/01/02 21:23:20 UTC
[06/14] git commit: [#5424] store repos on /srv instead of /tmp so
they don't disappear after reboot on most systems
[#5424] store repos on /srv instead of /tmp so they don't disappear after reboot on most systems
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/14911893
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/14911893
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/14911893
Branch: refs/heads/master
Commit: 14911893ee50d96390ae98bc56a3ac0269919153
Parents: 8666d13
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu Dec 12 18:18:47 2013 -0500
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jan 2 20:22:34 2014 +0000
----------------------------------------------------------------------
Allura/development.ini | 16 ++++++++--------
INSTALL.markdown | 11 +++++++++++
vagrant/manifests/ubuntu-1204-server-amd64.pp | 9 +++++++++
3 files changed, 28 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/14911893/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 5a3d83f..edfb794 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -109,14 +109,14 @@ static.url_base = /nf/%(build_key)s/_static_/
ew.extra_headers = [ ('Access-Control-Allow-Origin', '*') ]
# SCM settings for local development
-scm.host.ro.git = /tmp/git$path
-scm.host.rw.git = /tmp/git$path
+scm.host.ro.git = /srv/git$path
+scm.host.rw.git = /srv/git$path
# remote access varies by configuration. If you are using a vagrant VM, this should work:
-#scm.host.rw.git = ssh://vagrant@localhost:2222/tmp/git$path
-scm.host.ro.hg = /tmp/hg$path
-scm.host.rw.hg = /tmp/hg$path
-scm.host.ro.svn = file:///tmp/svn$path/
-scm.host.rw.svn = file:///tmp/svn$path/
+#scm.host.rw.git = ssh://vagrant@localhost:2222/srv/git$path
+scm.host.ro.hg = /srv/hg$path
+scm.host.rw.hg = /srv/hg$path
+scm.host.ro.svn = file:///srv/svn$path/
+scm.host.rw.svn = file:///srv/svn$path/
# SCM settings for chroot + ldap configuration. See Allura/docs/scm_host.rst
# scm.host.ro.git = git://git.localhost$path
@@ -145,7 +145,7 @@ scm.new_refresh = true
gitweb.cgi = /usr/lib/cgi-bin/gitweb.cgi
-scm.repos.root = /tmp
+scm.repos.root = /srv
scm.repos.tarball.enable = false
scm.repos.tarball.root = /usr/share/nginx/www/
scm.repos.tarball.url_prefix = http://localhost/
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/14911893/INSTALL.markdown
----------------------------------------------------------------------
diff --git a/INSTALL.markdown b/INSTALL.markdown
index f8afa23..cce192e 100644
--- a/INSTALL.markdown
+++ b/INSTALL.markdown
@@ -114,6 +114,17 @@ We have a custom config ready for use.
(env-allura)~/src/apache-solr-4.2.1/example/$ nohup java -jar start.jar > ~/logs/solr.log &
+### Create code repo directories
+
+The default configuration stores repos in `/srv`, so we need to create those directories:
+
+ sudo mkdir /srv/{git,svn,hg}
+ sudo chown $USER /srv/{git,svn,hg}
+
+If you don't have `sudo` permission or just want to store them somewhere else, change the `/srv` paths in `development.ini`
+
+If you want to set up remote access to the repositories, see <http://allura.sourceforge.net/docs/scm_host.html>
+
### Allura task processing
Allura uses a background task service called "taskd" to do async tasks like sending emails, and indexing data into solr, etc. Let's get it running
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/14911893/vagrant/manifests/ubuntu-1204-server-amd64.pp
----------------------------------------------------------------------
diff --git a/vagrant/manifests/ubuntu-1204-server-amd64.pp b/vagrant/manifests/ubuntu-1204-server-amd64.pp
index be00025..ead0205 100644
--- a/vagrant/manifests/ubuntu-1204-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1204-server-amd64.pp
@@ -143,3 +143,12 @@ file { '/svn':
owner => "vagrant",
group => "vagrant",
}
+
+# create SCM repo dirs
+file { [ "/srv/git", "/srv/hg", "/srv/svn" ]:
+ ensure => "directory",
+ owner => "vagrant",
+ group => "vagrant",
+ mode => 770,
+}
+