diff --git a/pkg/fedora/.bundle/config b/pkg/fedora/.bundle/config deleted file mode 100644 index 1c3e2cedfba380644aaa579fb3b6c352222bfb81..0000000000000000000000000000000000000000 --- a/pkg/fedora/.bundle/config +++ /dev/null @@ -1,5 +0,0 @@ ---- -BUNDLE_FROZEN: "1" -BUNDLE_DISABLE_SHARED_GEMS: "1" -BUNDLE_WITHOUT: test:rdoc -BUNDLE_PATH: vendor/bundle diff --git a/pkg/fedora/diaspora-reset b/pkg/fedora/diaspora-reset index f9315b37db4ba696fafcbc216421b54031e504c4..cc07c78b4c2508608ed9eeb4da1847962a25a17a 100755 --- a/pkg/fedora/diaspora-reset +++ b/pkg/fedora/diaspora-reset @@ -1,5 +1,7 @@ #!/bin/sh - +# +# Try to revert to pristine state, deleting all users and +# configuration set -x service mongod stop @@ -9,3 +11,4 @@ cp /usr/share/diaspora/master/config/app_config.yml.example \ /usr/share/diaspora/master/config/app_config.yml service mongod start + diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup index e92a2610e30b9a1a2f50f8fdf3a79728e761b577..f6ff46bb7129c622c512ec7e0d8e7e3693cee9cb 100755 --- a/pkg/fedora/diaspora-setup +++ b/pkg/fedora/diaspora-setup @@ -12,7 +12,6 @@ test $UID = "0" || { exit 2 } -# Note: this line is patched by installation scripts. cd /usr/share/diaspora/master /sbin/service mongod start || : @@ -21,7 +20,7 @@ test -e config/app_config.yml || cp config/app_config.yml.example config/app_config.yml if rake db:seed:dev; then - echo "Database config OK, new user tom/evankort in place" + echo "Database config OK, new user tom/evankorth in place" else cat <<- EOF diff --git a/pkg/fedora/diaspora-ws b/pkg/fedora/diaspora-ws index 6208acc1c112b7f7c43d14be94bac5902ba9b7c5..90dc28f8fe4b69c740e8d96d2b5d053d03161d14 100755 --- a/pkg/fedora/diaspora-ws +++ b/pkg/fedora/diaspora-ws @@ -27,6 +27,7 @@ if [ -f /etc/sysconfig/diaspora-ws -a $UID -eq 0 ]; then . /etc/sysconfig/diaspora-ws fi +# Note: this line is patched by installation scripts. cd /usr/share/diaspora RETVAL=0 diff --git a/pkg/fedora/diaspora.logconf b/pkg/fedora/diaspora.logconf index 48eca391602e7234fe22397a84f4acb5d6722b0c..767c2d7a26b2e5ff2bb4c509a852583d475adf17 100644 --- a/pkg/fedora/diaspora.logconf +++ b/pkg/fedora/diaspora.logconf @@ -1,5 +1,5 @@ /var/log/diaspora/*.log { - create 755 diaspora apache + create 755 diaspora diaspora weekly rotate 10 copytruncate