a lot of fix

.gitignore

@@ -1,4 +1,3 @@
-media/*
 static/*
 *.pyc
 frontend/static/*

app/conf/nginx.conf.template

@@ -1,5 +1,5 @@
 upstream django_zuykov {
-    server unix:///home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/wsgi_transcribe_ninja.sock;
+    server unix:///home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/wsgi.sock;
 }
 
 server {

app/deploy/django.py

@@ -8,6 +8,8 @@ from deployer.utils import esc1
 
 from app.deploy.debian import Debian
 
+from app import settings
+
 
 class DjangoDeployment(Debian):
     def run_management_command(self, command):

app/deploy/tasks.py

@@ -38,7 +38,7 @@ common_configure = [
     # First command as regular user
     {"action": "run", "params": "whoami"},
 
-    # List of APT packages to install
+    # List of APT packages to installsudo apt-get install
     {"action": "apt",
         "params": ["git",
                    "python-setuptools", "python-dev", "build-essential", "python-pip", "libmysqlclient-dev",
@@ -108,7 +108,7 @@ common_configure = [
 web_configure = [
     # List of APT packages to install
     {"action": "apt",
-        "params": ["nginx", "uwsgi", "uwsgi-plugin-python", "nodejs", "npm"],
+        "params": ["nginx", "uwsgi", "uwsgi-plugin-python", "nodejs", "npm", "less", "node-less", "yui-compressor"],
         "message":"Installing nginx, uwsgi, nodejs packages"},
     {"action": "sudo", "params": "npm install -g bower"},
     # # Костыль с нодой

app/deploy/zuykov.py

@@ -47,7 +47,7 @@ class ZuykovWebSystem(Node):
             self._configure_instance(tasks.web_configure)
 
         def restart(self):
-            self._configure_instance(tasks.create_uwsgi_links + tasks.reload_nginx + tasks.reload_uwsgi)
+            self._configure_instance(tasks.reload_nginx + tasks.reload_uwsgi)
 
         def update(self):
             self.checkout()
@@ -73,12 +73,11 @@ class ZuykovWebSystem(Node):
   
 
     def deploy(self):
-        pass
-        # self.Application.update()
+        self.Application.update()
 
-        # self.Application.python_packages_install()
+        self.Application.python_packages_install()
 
-        # self.update_hosts()
+        self.Application.restart()
 
         # self.Engine.migrate()
 

media/filer_public/c7/22/c7226e95-c12f-47c0-8920-f75a5deedeb2/calve.svg

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="377"
+   height="175"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-168.08686,-840.90161)">
+    <g
+       id="g8219"
+       clip-path="none"
+       transform="matrix(20.350895,0,0,-20.350895,-9976.6776,17563.833)">
+      <g
+         id="g8221"
+         transform="translate(501.5202,820.6219)">
+        <path
+           id="path8223"
+           d="M 0,0 C -1.109,-0.486 -3.009,-1.567 -3.009,-3.282 C -3.009,-6.161 1.795,-7.473 6.236,-7.473 C 10.675,-7.473 15.478,-6.161 15.478,-3.282 C 15.478,-0.392 10.547,1.075 7.554,1.075 C 6.679,1.1 5.701,1.154 5.092,1.024 C 4.356,0.868 4.381,-0.302 3.733,-0.434 C 2.758,-0.633 2.904,1.224 0,0"
+           style="fill:#ffffff;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8225"
+         transform="translate(516.7701,817.3397)">
+        <path
+           id="path8227"
+           d="M 0,0 C 0,2.658 -4.587,4.183 -7.946,4.161 C -8.358,4.158 -9.229,4.148 -9.67,4.082 C -10.295,3.989 -10.63,2.733 -11.385,2.581 C -12.311,2.394 -13.706,3.734 -15.182,3.087 C -16.574,2.478 -18.031,1.424 -18.031,0 C -18.031,-2.722 -13.26,-3.988 -9.014,-3.988 C -4.971,-3.988 0,-2.812 0,0"
+           style="fill:#9f7e43;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8229"
+         transform="translate(507.7562,813.5457)">
+        <path
+           id="path8231"
+           d="M 0,0 C -4.145,0 -7.709,1.371 -7.709,3.794 C -7.709,5.187 -5.873,6.396 -5.162,6.703 C -3.923,7.238 -3.059,5.443 -1.972,5.767 C -1.319,5.961 -0.318,7.373 0.487,7.605 C 1.077,7.774 2.442,7.645 3.149,7.469 C 4.365,7.167 7.706,5.928 7.706,3.794 C 7.706,1.199 3.707,0 0,0"
+           style="fill:#ffffff;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8233"
+         transform="translate(503.7073,820.9734)">
+        <path
+           id="path8235"
+           stroke-miterlimit="4"
+           d="M 0,0 C -0.451,0.132 -1.108,0.103 -2.187,-0.352 C -3.296,-0.838 -5.196,-1.919 -5.196,-3.634 C -5.196,-6.513 -0.392,-7.824 4.049,-7.824 C 8.488,-7.824 13.291,-6.513 13.291,-3.634 C 13.291,-1.6 10.849,-0.271 8.359,0.339"
+           style="fill:none;stroke:#ffffff;stroke-width:0.038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4" />
+      </g>
+      <g
+         id="g8237"
+         transform="translate(513.808,817.5879)">
+        <path
+           id="path8239"
+           d="M 0,0 C 0,0.069 0.027,0.134 0.076,0.183 C 0.125,0.232 0.19,0.259 0.259,0.259 C 0.328,0.259 0.393,0.232 0.442,0.183 C 0.491,0.134 0.518,0.069 0.518,0 C 0.518,-0.143 0.402,-0.259 0.259,-0.259 C 0.19,-0.259 0.125,-0.232 0.076,-0.183 C 0.027,-0.134 0,-0.069 0,0 M 0.259,-0.303 C 0.34,-0.303 0.416,-0.272 0.473,-0.214 C 0.531,-0.157 0.562,-0.081 0.562,0 C 0.562,0.081 0.531,0.157 0.473,0.214 C 0.416,0.272 0.34,0.303 0.259,0.303 C 0.092,0.303 -0.044,0.167 -0.044,0 C -0.044,-0.081 -0.013,-0.157 0.045,-0.214 C 0.102,-0.272 0.178,-0.303 0.259,-0.303"
+           style="fill:#000000;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8241"
+         transform="translate(513.9265,817.7654)">
+        <path
+           id="path8243"
+           d="M 0,0 L 0,-0.358 L 0.073,-0.358 L 0.073,-0.217 L 0.15,-0.217 C 0.172,-0.217 0.187,-0.221 0.195,-0.229 C 0.203,-0.236 0.207,-0.252 0.208,-0.274 L 0.208,-0.308 C 0.208,-0.318 0.209,-0.328 0.211,-0.338 C 0.212,-0.343 0.214,-0.35 0.216,-0.358 L 0.298,-0.358 L 0.298,-0.349 C 0.291,-0.344 0.287,-0.337 0.285,-0.328 C 0.284,-0.322 0.283,-0.311 0.283,-0.295 L 0.283,-0.271 C 0.283,-0.246 0.279,-0.227 0.272,-0.215 C 0.266,-0.203 0.254,-0.193 0.237,-0.187 C 0.257,-0.18 0.271,-0.168 0.28,-0.152 C 0.288,-0.136 0.293,-0.119 0.293,-0.102 C 0.293,-0.088 0.291,-0.075 0.286,-0.064 C 0.281,-0.053 0.275,-0.043 0.268,-0.034 C 0.258,-0.023 0.247,-0.015 0.233,-0.009 C 0.22,-0.004 0.2,-0.001 0.175,0 L 0,0 z M 0.196,-0.068 C 0.211,-0.076 0.218,-0.09 0.218,-0.112 C 0.218,-0.132 0.21,-0.146 0.195,-0.152 C 0.187,-0.156 0.174,-0.158 0.158,-0.158 L 0.073,-0.158 L 0.073,-0.062 L 0.16,-0.062 C 0.176,-0.062 0.188,-0.064 0.196,-0.068"
+           style="fill:#000000;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8245"
+         transform="translate(505.7219,816.8657)">
+        <path
+           id="path8247"
+           d="M 0,0 C -0.301,-0.029 -0.678,-0.201 -0.656,-0.415 C -0.621,-0.769 0,-0.706 0.002,-0.282 C 0.004,0.021 0,0 0,0 M 0.028,-0.778 C 0.029,-0.793 -0.473,-1.112 -0.87,-1.073 C -0.974,-1.063 -1.549,-1.046 -1.542,-0.509 C -1.533,0.133 -0.186,0.095 -0.058,0.308 C 0.006,0.415 0.019,0.817 -0.306,0.804 C -0.739,0.787 -0.743,0.431 -0.951,0.261 C -1.197,0.06 -1.58,0.218 -1.319,0.56 C -0.928,1.074 -0.197,1.034 -0.182,1.035 C 0.399,1.07 0.83,0.744 0.828,0.381 C 0.826,0.115 0.825,-0.539 0.825,-0.573 C 0.825,-0.659 0.88,-0.854 1.039,-0.866 C 1.157,-0.875 1.182,-1.035 1.039,-1.043 C 1.039,-1.043 0.393,-1.044 0.391,-1.043 C 0.247,-1.039 0.047,-0.945 0.028,-0.778"
+           style="fill:#e2001a;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8249"
+         transform="translate(509.7362,815.7624)">
+        <path
+           id="path8251"
+           d="M 0,0 C 0,0 -0.966,1.706 -0.996,1.753 C -1.026,1.8 -1.063,1.852 -1.227,1.86 C -1.392,1.869 -1.371,2.036 -1.209,2.036 L 0.154,2.036 C 0.318,2.036 0.295,1.865 0.137,1.865 C 0.013,1.865 -0.015,1.805 -0.015,1.732 C -0.015,1.565 0.368,0.877 0.368,0.877 C 0.368,0.877 0.776,1.681 0.778,1.689 C 0.815,1.809 0.772,1.839 0.62,1.852 C 0.468,1.865 0.485,2.027 0.616,2.036 C 0.697,2.041 1.262,2.033 1.407,2.036 C 1.568,2.039 1.559,1.86 1.403,1.865 C 1.275,1.868 1.15,1.775 1.116,1.711 C 1.082,1.646 0.21,0.094 0.163,0.004 C 0.115,-0.086 0.03,-0.06 0,0"
+           style="fill:#e2001a;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8253"
+         transform="translate(512.087,817.1779)">
+        <path
+           id="path8255"
+           d="M 0,0 C 0.009,-0.049 0.03,-0.095 0.094,-0.103 C 0.128,-0.107 0.599,-0.103 0.599,-0.103 C 0.599,-0.103 0.671,-0.086 0.68,-0.021 C 0.689,0.043 0.671,0.428 0.325,0.428 C 0.158,0.428 -0.03,0.175 0,0 M 0.449,-1.099 C 0.804,-1.14 1.18,-0.956 1.279,-0.825 C 1.379,-0.691 1.487,-0.848 1.398,-0.949 C 1.144,-1.24 0.887,-1.428 0.291,-1.441 C -1.488,-1.479 -1.437,0.68 0.359,0.671 C 1.304,0.667 1.456,0.004 1.475,-0.137 C 1.487,-0.22 1.421,-0.364 1.274,-0.364 C 1.133,-0.364 -0.086,-0.366 -0.086,-0.366 C -0.118,-0.869 0.227,-1.073 0.449,-1.099"
+           style="fill:#e2001a;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8257"
+         transform="translate(503.983,818.0888)">
+        <path
+           id="path8259"
+           d="M 0,0 C 0.287,-0.7 -0.448,-0.668 -0.592,-0.244 C -0.633,-0.124 -0.631,0.039 -0.725,0.154 C -0.863,0.324 -1.029,0.318 -1.127,0.321 C -1.876,0.345 -2.242,-1.739 -1.135,-1.959 C -0.727,-2.04 -0.387,-1.751 -0.259,-1.621 C -0.126,-1.486 -0.014,-1.638 -0.103,-1.777 C -0.449,-2.32 -1.108,-2.367 -1.356,-2.365 C -3.094,-2.348 -3.494,0.314 -1.383,0.624 C -0.801,0.71 -0.163,0.396 0,0"
+           style="fill:#e2001a;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8261"
+         transform="translate(508.4744,815.9922)">
+        <path
+           id="path8263"
+           d="M 0,0 C -0.09,-0.004 -0.266,0.095 -0.27,0.213 L -0.269,2.617 C -0.27,2.79 -0.409,2.723 -0.409,2.723 L -1.346,2.317 C -1.481,2.255 -1.412,2.1 -1.28,2.156 C -1.049,2.255 -1.055,2.088 -1.055,2.088 L -1.055,0.206 C -1.055,0.044 -1.262,-0.004 -1.348,-0.005 C -1.459,-0.008 -1.457,-0.17 -1.352,-0.17 L 0.02,-0.17 C 0.164,-0.168 0.158,0.006 0,0"
+           style="fill:#e2001a;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         id="g8265"
+         transform="translate(512.1027,818.4054)">
+        <path
+           id="path8267"
+           d="M 0,0 C 0,0 0.585,0.66 1.093,0.717 C 1.294,0.74 1.532,0.723 1.571,0.512 C 1.609,0.307 1.488,0.211 1.298,0.205 C 0.991,0.195 0.645,0.181 0.354,0.019 C 0.246,-0.041 -0.1,-0.243 0,0"
+           style="fill:#e2001a;fill-rule:nonzero;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>