diff options
| author | Alec Leamas <leamas.alec@gmail.com> | 2010-11-01 08:13:31 +0300 |
|---|---|---|
| committer | Alec Leamas <leamas.alec@gmail.com> | 2010-11-01 08:13:31 +0300 |
| commit | 23e566ce2e663469f45f89300825f4e3a4fd9297 (patch) | |
| tree | 60e1d7166885bec64bd9f11b0f2a46f4c5e9557a /pkg | |
| parent | d8376b5a8401f510129fe05a55af6c2a3018c5a0 (diff) | |
bugfix
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/.gitignore | 1 | ||||
| -rwxr-xr-x | pkg/bootstrap-fedora-diaspora.sh | 17 | ||||
| -rw-r--r-- | pkg/source/funcs.sh | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/pkg/.gitignore b/pkg/.gitignore index 1521c8b76..470b7660b 100644 --- a/pkg/.gitignore +++ b/pkg/.gitignore @@ -1 +1,2 @@ dist +*.log diff --git a/pkg/bootstrap-fedora-diaspora.sh b/pkg/bootstrap-fedora-diaspora.sh index 67ba40fc2..34b32eb1b 100755 --- a/pkg/bootstrap-fedora-diaspora.sh +++ b/pkg/bootstrap-fedora-diaspora.sh @@ -5,10 +5,8 @@ # Usage: bootstrap-fedora-diaspora.sh [external hostname] # # Must run as root - -arg_hostname="$1" - -. source/funcs.sh +GIT_REPO='git@github.com:leamas/diaspora.git' +DIASPORA_HOSTNAME='mumin.dnsalias.net' test $UID = "0" || { echo "You need to be root to do this, giving up" @@ -67,14 +65,19 @@ if [[ -z "\$ruby" || ("\${ruby:0:4}" == "/usr") ]]; then fi echo '### Clone diapora, install bundle. ###' -git clone git@github.com:diaspora/diaspora.git +rm -rf diaspora +git clone $GIT_REPO cd diaspora +echo "PWD: \$PWD" +echo "pkg: \$(ls pkg)" +echo "source: \$(ls pkg/source)" +source pkg/source/funcs.sh bundle install #Configure diaspora -source pkg/source/funcs.sh -init_appconfig config/app_config.yml "\$arg_hostname" +cp config/app_config.yml.example config/app_config.yml +init_appconfig config/app_config.yml "$DIASPORA_HOSTNAME" # Install DB setup echo "Setting up DB..." diff --git a/pkg/source/funcs.sh b/pkg/source/funcs.sh index 8fb0ee937..e47af236d 100644 --- a/pkg/source/funcs.sh +++ b/pkg/source/funcs.sh @@ -83,7 +83,7 @@ function init_appconfig # Usage: init_appconfig <app_config.yml> [hostname] { config=$1 - arg_hostanme="$2" + arg_hostname="$2" hostname=$( awk '/pod_url:/ { print $2; exit }' <$config ) if [ -n "$arg_hostname" ]; then |