Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud

miscellaneous/devenv/init.sh

@@ -16,6 +16,9 @@ then
         echo -n "Your name: "
         read NAME
         git config --global user.name "$NAME"
+        echo -n "Your e-mail address: "
+        read MAIL
+        git config --global user.email "$MAIL"
 fi
 
 
@@ -43,35 +46,4 @@ mv cloud cloud.$(date +%s) || true
 git clone 'ssh://git@giccero.cloud.ik.bme.hu/cloud'
 
 cd cloud
-./manage.py syncdb --noinput
-./manage.py migrate
-./manage.py createsuperuser --email=cloud@ik.bme.hu
-./manage.py loaddata /home/cloud/user.yaml 2>/dev/null || true
-./manage.py loaddata /home/cloud/fw.yaml
-./manage.py loaddata /home/cloud/one.yaml
-./manage.py loaddata /home/cloud/store.yaml
-./manage.py update
-
-#Set up store server
-rm -rf /var/www/*
-mkdir -p /var/www
-cd /opt/webadmin/cloud/miscellaneous/store-server/
-LOCAL_IP=$(ip addr show dev eth0|grep inet|head -1|awk '{print $2}'|cut -d '/' -f 1)
-cat <<EOF > store.config
-[store]
-#Default root folder (for download and upload)
-root_www_folder = /var/www
-#Deafult binary folder (for executables)
-root_bin_folder = /opt/webadmin/cloud/miscellaneous/store-server/
-#Site host (for standalone server)
-site_host = 0.0.0.0
-#Site port (for standalone server)
-site_port = 9000
-#Site url (for download and upload links) %(variable)formatter ex: %(port)s
-site_url = http://${LOCAL_IP}:%(site_port)s
-#User manager script (add, del, set, update)
-user_manager = FAKEUserManager.sh
-#Temporary directory
-temp_dir = /tmp/dl
-EOF
-sudo /opt/webadmin/cloud/miscellaneous/store-server/CloudStore.py >/dev/null 2>&1 &
+miscellaneous/devenv/nextinit.sh

miscellaneous/devenv/nextinit.sh

+#!/bin/bash
+
+cd /opt/webadmin/cloud
+./manage.py syncdb --noinput
+./manage.py migrate
+echo '"test" user password:'
+./manage.py loaddata miscellaneous/dump.json
+./manage.py changepassword test
+./manage.py update
+
+#Set up store server
+rm -rf /var/www/*
+mkdir -p /var/www
+cd /opt/webadmin/cloud/miscellaneous/store-server/
+LOCAL_IP=$(ip addr show dev eth0|grep inet|head -1|awk '{print $2}'|cut -d '/' -f 1)
+cat <<EOF > store.config
+[store]
+#Default root folder (for download and upload)
+root_www_folder = /var/www
+#Deafult binary folder (for executables)
+root_bin_folder = /opt/webadmin/cloud/miscellaneous/store-server/
+#Site host (for standalone server)
+site_host = 0.0.0.0
+#Site port (for standalone server)
+site_port = 9000
+#Site url (for download and upload links) %(variable)formatter ex: %(port)s
+site_url = http://${LOCAL_IP}:%(site_port)s
+#User manager script (add, del, set, update)
+user_manager = FAKEUserManager.sh
+#Temporary directory
+temp_dir = /tmp/dl
+EOF
+sudo /opt/webadmin/cloud/miscellaneous/store-server/CloudStore.py >/dev/null 2>&1 &
+sudo /opt/webadmin/cloud/miscellaneous/store-server/TopList.py >/dev/null 2>&1 &
+
+cd /opt/webadmin/cloud/miscellaneous/devenv
+
+sudo cp vimrc.local /etc/vim/vimrc.local

miscellaneous/devenv/vimrc.local

+highlight ExtraWhitespace ctermfg=white ctermbg=red guibg=red guifg=white
+match ExtraWhitespace /\(\s\+$\|^\s*\t\|,[^ ]\|[;]$\|#[^ ].\|def [A-Z]\|class [a-z]\)/
+autocmd BufWinEnter * match ExtraWhitespace /\(\s\+$\|^\s*\t\|,[^ ]\|[;]$\|#[^ ].\|def [A-Z]\|class [a-z]\)/
+autocmd BufWinLeave * call clearmatches()
+
+set et
+set sw=4
+set ai
+set smarttab
+

miscellaneous/dump.sh

+#!/bin/bash
+
+
+/opt/webadmin/cloud/manage.py dumpdata -e admin -e one.userclouddetails -e school -e auth.permission -e contenttypes -e sessions -e djcelery --format=json --indent=2|grep -v '"password":'|sed -e 's/^.*"smb_password":.*$/"smb_password": "kamu",/' -e 's/BEGIN RSA PRIVATE.*END RSA/xxx/' >/opt/webadmin/cloud/miscellaneous/dump.json
+
+