Revision fba7aaf4

b/ci/schemas/one_node_wheezy/wheezy.conf
47 47

  
48 48
[other]
49 49
snf-cloudcms = wheezy
50
snf-vncauthproxy = wheezy
50
snf-vncauthproxy = unstable
51 51
snf-pithos-webclient = wheezy
52 52
snf-image = wheezy
53 53
snf-network = wheezy
b/docs/upgrade/upgrade-0.15.rst
164 164
-------------------------------------------------------
165 165

  
166 166
Synnefo v0.15 adds support for snf-vncauthproxy >= 1.5 and drops support for
167
older versions. You will have to upgrade snf-vncauthproxy to v1.5 and  configure
168
the authentication (users) file (``/var/lib/vncauthproxy/users``).
167
older versions. You will have to upgrade snf-vncauthproxy to v1.5 and
168
configure the authentication (users) file (``/var/lib/vncauthproxy/users``).
169 169

  
170
In case you're upgrading from an older snf-vncauthproxy version or it's the
171
first time you're installing snf-vncauthproxy, you will prompted to configure
172
a vncauthproxy user (see below for more information on user management).
170
In case you're upgrading from an older snf-vncauthproxy version or if it's the
171
first time you're installing snf-vncauthproxy, you will need to add a
172
vncauthproxy user (see below for more information on user management) and
173
restart vncauthproxy daemon.
173 174

  
174 175
To manage the authentication file, you can use the vncauthproxy-passwd tool,
175
to easily add, update and delete users
176
to easily add, update and delete users.
176 177

  
177 178
To add a user:
179

  
178 180
.. code-block:: console
179 181

  
180 182
    # vncauthproxy-passwd /var/lib/vncauthproxy/users synnefo
b/snf-cyclades-app/setup.py
68 68
    'puka',
69 69
    'python-daemon>=1.5.5, <1.6',
70 70
    'snf-common',
71
    'vncauthproxy>=1.5',
71
    'vncauthproxy>1.4',
72 72
    'snf-pithos-backend',
73 73
    'lockfile>=0.8, <0.9',
74 74
    'ipaddr',
b/snf-deploy/files/etc/apt/sources.list.d/synnefo.wheezy.list
1 1
deb http://ftp.de.debian.org/debian wheezy main non-free contrib
2 2

  
3 3
deb http://apt.dev.grnet.gr wheezy/
4
deb http://apt.dev.grnet.gr unstable/
b/snf-deploy/files/etc/synnefo/cyclades.conf
81 81
}
82 82

  
83 83
CYCLADES_BASE_URL = 'https://%CYCLADES%/cyclades'
84

  
85
CYCLADES_VNCAUTHPROXY_OPTS = {
86
    'auth_user': 'synnefo',
87
    'auth_password': 'synnefo_vnc_pass',
88
}
b/snf-deploy/snfdeploy/fabfile.py
1312 1312
@roles("cyclades")
1313 1313
def setup_vncauthproxy():
1314 1314
    debug(env.host, " * Setting up vncauthproxy...")
1315
    install_package("snf-vncauthproxy")
1315
    user = "synnefo"
1316
    salt = "$6$7FUdSvFcWAs3hfVj$"
1317
    passhash = "ZwvnvpQclTrDYWEwBvZDMRJZNgb6ZUKT1vNsh9NzUIxMpzBuGgMqYxCDTYF"\
1318
               "6OZcbunDZb88pjL2EIBnzrGMQW1"
1316 1319
    cmd = """
1317
    echo CHUID="www-data:nogroup" >> /etc/default/vncauthproxy
1318
    rm /var/log/vncauthproxy/vncauthproxy.log
1319
    """
1320
    mkdir /var/lib/vncauthproxy
1321
    echo '%s:%s%s' > /var/lib/vncauthproxy/users
1322
    """ % (user, salt, passhash)
1320 1323
    try_run(cmd)
1321
    try_run("/etc/init.d/vncauthproxy restart")
1324
    install_package("snf-vncauthproxy")
1322 1325

  
1323 1326

  
1324 1327
@roles("client")

Also available in: Unified diff