Skip to content

Commit dc14fac

Browse files
Update moin configuration to run in development (#262)
* First steps to upgrading moin * moin: bind to 127.0.0.1 explicitly * Moin: Explicitly install python2.7 * Update salt/moin/init.sls Co-authored-by: Ee Durbin <[email protected]>
1 parent c7b94e1 commit dc14fac

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% set internal = salt["pillar.get"]("psf_internal_network") %}
22
Listen {{ salt["network.ip_addrs"](cidr=internal)[0] }}:9000
3-
Listen localhost:9000
3+
Listen 127.0.0.1:9000

salt/moin/init.sls

+22-3
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ moin:
44

55
user.present:
66
- home: /srv/moin
7-
- gid_from_name: True
7+
- groups:
8+
- moin
89
- require:
910
- group: moin
1011

1112
moin-pkgs:
1213
pkg.installed:
1314
- pkgs:
1415
- build-essential
15-
- python-virtualenv
1616
- python-docutils
1717
- python-gdchart2
18-
- python-openid
1918
- python-xapian
19+
- python2.7
20+
- python2.7-dev
21+
- curl
2022

2123
www-data:
2224
user.present:
@@ -27,12 +29,29 @@ www-data:
2729
- user: moin
2830
- pkg: moin-pkgs
2931

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+
3044
/srv/moin/venv:
3145
virtualenv.managed:
3246
- user: moin
3347
- system_site_packages: True
48+
- virtualenv_bin: /usr/local/bin/virtualenv
49+
- python: /usr/bin/python2.7
50+
- require:
51+
- cmd: virtualenv
3452
- pip_pkgs:
3553
- moin==1.9.11
54+
- python-openid==2.2.5
3655

3756
/srv/moin/moin.wsgi:
3857
file.managed:

0 commit comments

Comments
 (0)