nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix

Browse source
This commit is contained in:
Alec Leamas 2010-11-01 06:13:31 +01:00
parent d8376b5a84
commit 23e566ce2e
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/.gitignore vendored
View file

@ -1 +1,2 @@
dist dist
*.log

17
pkg/bootstrap-fedora-diaspora.sh
View file

@ -5,10 +5,8 @@
# Usage: bootstrap-fedora-diaspora.sh [external hostname] # Usage: bootstrap-fedora-diaspora.sh [external hostname]
# #
# Must run as root # Must run as root
GIT_REPO='git@github.com:leamas/diaspora.git'
arg_hostname="$1" DIASPORA_HOSTNAME='mumin.dnsalias.net'
. source/funcs.sh
test $UID = "0" || { test $UID = "0" || {
echo "You need to be root to do this, giving up" echo "You need to be root to do this, giving up"
@ -67,14 +65,19 @@ if [[ -z "\$ruby" || ("\${ruby:0:4}" == "/usr") ]]; then
fi fi
echo '### Clone diapora, install bundle. ###' echo '### Clone diapora, install bundle. ###'
git clone git@github.com:diaspora/diaspora.git rm -rf diaspora
git clone $GIT_REPO
cd diaspora cd diaspora
echo "PWD: \$PWD"
echo "pkg: \$(ls pkg)"
echo "source: \$(ls pkg/source)"
source pkg/source/funcs.sh
bundle install bundle install
#Configure diaspora #Configure diaspora
source pkg/source/funcs.sh cp config/app_config.yml.example config/app_config.yml
init_appconfig config/app_config.yml "\$arg_hostname" init_appconfig config/app_config.yml "$DIASPORA_HOSTNAME"
# Install DB setup # Install DB setup
echo "Setting up DB..." echo "Setting up DB..."

2
pkg/source/funcs.sh
View file

@ -83,7 +83,7 @@ function init_appconfig
# Usage: init_appconfig <app_config.yml> [hostname] # Usage: init_appconfig <app_config.yml> [hostname]
{ {
config=$1 config=$1
arg_hostanme="$2" arg_hostname="$2"
hostname=$( awk '/pod_url:/ { print $2; exit }' <$config ) hostname=$( awk '/pod_url:/ { print $2; exit }' <$config )
if [ -n "$arg_hostname" ]; then if [ -n "$arg_hostname" ]; then