File tree 2 files changed +23
-4
lines changed
2 files changed +23
-4
lines changed Original file line number Diff line number Diff line change 1
1
{% set internal = salt ["pillar.get" ]("psf_internal_network" ) %}
2
2
Listen {{ salt["network.ip_addrs"] (cidr=internal)[0] }}:9000
3
- Listen localhost :9000
3
+ Listen 127.0.0.1 :9000
Original file line number Diff line number Diff line change 4
4
5
5
user.present :
6
6
- home: /srv/moin
7
- - gid_from_name: True
7
+ - groups:
8
+ - moin
8
9
- require:
9
10
- group: moin
10
11
11
12
moin-pkgs :
12
13
pkg.installed :
13
14
- pkgs:
14
15
- build-essential
15
- - python-virtualenv
16
16
- python-docutils
17
17
- python-gdchart2
18
- - python-openid
19
18
- python-xapian
19
+ - python2.7
20
+ - python2.7-dev
21
+ - curl
20
22
21
23
www-data :
22
24
user.present :
@@ -27,12 +29,29 @@ www-data:
27
29
- user: moin
28
30
- pkg: moin-pkgs
29
31
32
+ pip:
33
+ cmd.run :
34
+ - name: curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
35
+ - creates: /usr/local/bin/pip2.7
36
+ - umask: 022
37
+
38
+ virtualenv:
39
+ cmd.run :
40
+ - name: /usr/local/bin/pip2.7 install "virtualenv<21"
41
+ - creates: /usr/local/bin/virtualenv
42
+ - umask: 022
43
+
30
44
/srv/moin/venv :
31
45
virtualenv.managed :
32
46
- user: moin
33
47
- system_site_packages: True
48
+ - virtualenv_bin: /usr/local/bin/virtualenv
49
+ - python: /usr/bin/python2.7
50
+ - require:
51
+ - cmd: virtualenv
34
52
- pip_pkgs:
35
53
- moin==1.9.11
54
+ - python-openid==2.2.5
36
55
37
56
/srv/moin/moin.wsgi :
38
57
file.managed :
You can’t perform that action at this time.
0 commit comments