- much better default configuration with two local storages: directory & webdav
authorJosef Spillner <josef.spillner@tu-dresden.de>
Fri, 7 Feb 2014 09:38:09 +0000 (10:38 +0100)
committerJosef Spillner <josef.spillner@tu-dresden.de>
Fri, 7 Feb 2014 09:38:09 +0000 (10:38 +0100)
data/nubisave-config/.nubisave/db/deactivated_splitter_configuration/ssh111111 [deleted file]
data/nubisave-config/.nubisave/db/splitter_configuration/directory111111 [new file with mode: 0644]
data/nubisave-config/.nubisave/db/splitter_configuration/directory1517055 [deleted file]
data/nubisave-config/.nubisave/db/splitter_configuration/directory6461890 [deleted file]
data/nubisave-config/.nubisave/db/splitter_configuration/directory8613561 [deleted file]
data/nubisave-config/.nubisave/db/splitter_configuration/webdav111111
data/nubisave-config/.storages/connections.txt
scripts/fill-demonstrator-nubisave-system.sh

diff --git a/data/nubisave-config/.nubisave/db/deactivated_splitter_configuration/ssh111111 b/data/nubisave-config/.nubisave/db/deactivated_splitter_configuration/ssh111111
deleted file mode 100644 (file)
index 1fe8b41..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[module]
-name = SSH Cloud
-desc = Network drive accessible through Secure Shell, using SSHFS
-
-[mounting]
-#every word delimited by a space is substituted by the value given in the parameter section
-#mountpoint is substituted by the mountpoint
-mountcommand = sh mountscripts/mount_sshfs.sh mountpoint user server remotedir
-unmountcommand = sh mountscripts/unmount_sshfs.sh mountpoint
-
-[parameter]
-user = cloud
-password = cloud
-server = localhost
-remotedir = /home/cloud
diff --git a/data/nubisave-config/.nubisave/db/splitter_configuration/directory111111 b/data/nubisave-config/.nubisave/db/splitter_configuration/directory111111
new file mode 100644 (file)
index 0000000..11a6f2a
--- /dev/null
@@ -0,0 +1,18 @@
+#This file is for mounting any folder on your filesystem
+
+[parameter]
+directory = /media
+
+#hidden
+[mounting]
+#mountpoint is substituted by the mountpoint
+mountcommand = sh mountscripts/mount_directory.sh mountpoint directory
+unmountcommand = sh mountscripts/unmount_directory.sh mountpoint
+
+[splitter]
+fileparts = 1
+
+[gui]
+graphlocationx = 124
+graphlocationy = 236
+
diff --git a/data/nubisave-config/.nubisave/db/splitter_configuration/directory1517055 b/data/nubisave-config/.nubisave/db/splitter_configuration/directory1517055
deleted file mode 100644 (file)
index 187b0d8..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#This file is for mounting any folder on your filesystem
-
-[parameter]
-directory = /media/piboxssd
-
-#hidden
-[mounting]
-#mountpoint is substituted by the mountpoint
-mountcommand = sh mountscripts/mount_directory.sh mountpoint directory
-unmountcommand = sh mountscripts/unmount_directory.sh mountpoint
-
-[splitter]
-fileparts = 1
-
-[gui]
-graphlocationx = 124
-graphlocationy = 236
-
diff --git a/data/nubisave-config/.nubisave/db/splitter_configuration/directory6461890 b/data/nubisave-config/.nubisave/db/splitter_configuration/directory6461890
deleted file mode 100644 (file)
index d6c4840..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#This file is for mounting any folder on your filesystem
-
-[parameter]
-directory = /media/spycloud
-
-#hidden
-[mounting]
-#mountpoint is substituted by the mountpoint
-mountcommand = sh mountscripts/mount_directory.sh mountpoint directory
-unmountcommand = sh mountscripts/unmount_directory.sh mountpoint
-
-[splitter]
-fileparts = 1
-
-[gui]
-graphlocationx = 172
-graphlocationy = 149
-
diff --git a/data/nubisave-config/.nubisave/db/splitter_configuration/directory8613561 b/data/nubisave-config/.nubisave/db/splitter_configuration/directory8613561
deleted file mode 100644 (file)
index 08ecb30..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#This file is for mounting any folder on your filesystem
-
-[parameter]
-directory = /media/friendhdd
-
-#hidden
-[mounting]
-#mountpoint is substituted by the mountpoint
-mountcommand = sh mountscripts/mount_directory.sh mountpoint directory
-unmountcommand = sh mountscripts/unmount_directory.sh mountpoint
-
-[splitter]
-fileparts = 1
-
-[gui]
-graphlocationx = 176
-graphlocationy = 313
-
index 207df02..c4a184a 100644 (file)
@@ -1,11 +1,11 @@
 [module]
-name = WebDAV Cloud
+name = NubiGate WebDAV
 desc = Network drive accessible through WebDAV/HTTP, using FuseDAV
 
 [parameter]
 password = cloud
 user = cloud
-davurl = http://cloud/webdav
+davurl = http://localhost/dav/
 
 #hidden
 [mounting]
index e103f31..35a9747 100644 (file)
@@ -1,4 +1,2 @@
-Nubisave111111 directory6461890
-Nubisave111111 directory1517055
-Nubisave111111 directory8613561
+Nubisave111111 directory111111
 Nubisave111111 webdav111111
index ed1174e..b252eba 100755 (executable)
@@ -66,8 +66,8 @@ sudo chroot $system apt-get --assume-yes install python-inotifyx
 sudo chroot $system apt-get --assume-yes install openssh-server apache2-utils apache2.2-common
 sudo chroot $system a2enmod dav_fs dav_svn
 
-sudo chroot $system mkdir -p /var/www/webdav
-sudo chroot $system chown www-data:www-data /var/www/webdav
+sudo chroot $system mkdir -p /var/www/dav
+sudo chroot $system chown www-data:www-data /var/www/dav
 
 #sudo chroot $system adduser --quiet --disabled-password --home /cloud --gecos "The Cloud" cloud
 #echo "cloud:cloud" | sudo chroot $system chpasswd
@@ -78,3 +78,13 @@ sudo cp data/cloud.dav.vhost $system/etc/apache2/sites-available/cloud.dav
 sudo chroot $system a2ensite cloud.dav
 
 #echo "127.0.0.1 cloud" | sudo tee -a $system/etc/hosts >/dev/null
+
+grep -v "^exit 0" $system/etc/rc.local > .rc.local
+echo "su -c '#nubisave headless && sleep 5 && nubisave-mounter && sleep 5 && mkdir /home/demo/nubisave/owncloud && chown www-data:www-data /home/demo/nubisave/owncloud' demo &" >> .rc.local
+chmod +x .rc.local
+sudo mv .rc.local $system/etc/rc.local
+
+sudo rm -rf $system/var/www/owncloud/data
+sudo chroot $system ln -s /home/demo/nubisave/owncloud /var/www/owncloud/data
+
+sudo chroot $system chown demo:demo /media