crans/crans_bcfg2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vo: harmonise la conf intranet2 avec celle d'o2

Browse source
This commit is contained in:
Daniel STAN 2015-07-01 22:34:13 +02:00
parent 3b16698bb1
commit bfd0fb7f71
4 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Metadata/groups.xml
View file

@ -387,6 +387,7 @@
<Group name="o2" <Group name="o2"
profile="true"> profile="true">
<!-- à activer vers jessie: <Group name="intranet2-service"/>-->
<Group name="crans-vm-wheezy"/> <Group name="crans-vm-wheezy"/>
<Group name="intranet2-server"/> <Group name="intranet2-server"/>
<Group name="https_cert"/> <Group name="https_cert"/>
@ -1598,7 +1599,15 @@
</Group> </Group>
<Group name="intranet2-dev"> <Group name="intranet2-dev">
<Bundle name="intranet2-service"/> <Group name="intranet2-service"/>
<Group name="nginx"/> <!-- Pour l'intranet -->
<Group name="gunicorn"/>
<Group name="secrets-acl"/>
<Bundle name="quota"/>
</Group>
<Group name="intranet2-service">
<Bundle name="intranet2-service"/>
</Group> </Group>

2
Python/etc/cron.daily/git_dirty_repo
View file

@ -28,5 +28,5 @@ if has("vert"):
if has("news-server"): if has("news-server"):
out('%s --untracked-weekly --repository=/var/www --from="%s" --to="%s"' % (notifier_path, default_from, default_to)) out('%s --untracked-weekly --repository=/var/www --from="%s" --to="%s"' % (notifier_path, default_from, default_to))
if has("intranet2-server"): if has("intranet2-service"):
out('%s --untracked-weekly --repository=/usr/local/django/intranet --from="%s" --to="%s"' % (notifier_path, default_from, default_to)) out('%s --untracked-weekly --repository=/usr/local/django/intranet --from="%s" --to="%s"' % (notifier_path, default_from, default_to))

5
Python/etc/monit/services
View file

@ -89,6 +89,11 @@ if has('radio'):
service(None, name='radio-vlc', start_cmd = "/etc/init.d/radio start", stop_cmd = "/etc/init.d/radio stop", pidp='/tmp/multicast.pid') service(None, name='radio-vlc', start_cmd = "/etc/init.d/radio start", stop_cmd = "/etc/init.d/radio stop", pidp='/tmp/multicast.pid')
service(None, name='radio-igmp', start_cmd = "/etc/init.d/igmp start", stop_cmd = "/etc/init.d/igmp stop", pidf='igmp') service(None, name='radio-igmp', start_cmd = "/etc/init.d/igmp start", stop_cmd = "/etc/init.d/igmp stop", pidf='igmp')
service('intranet2-service',
name="intranet2",
pidp='/run/gunicorn/intranet2.pid',
)
if has('gunicorn'): if has('gunicorn'):
# on utilise le prob gunicorn-debian, qui liste les sites actifs sur # on utilise le prob gunicorn-debian, qui liste les sites actifs sur
# /etc/gunicorn.d/ # /etc/gunicorn.d/

9
Python/etc/systemd/system/intranet2.service
View file

@ -24,12 +24,9 @@ After=network-online.target
Type=forking Type=forking
User=root User=root
Group=root Group=root
PIDFile=/run/gunicorn/intranet2.pid""") PIDFile=/run/gunicorn/intranet2.pid
if has('intranet2-dev'): WorkingDirectory=/usr/local/django/intranet/
out("""WorkingDirectory=/localhome/django/intranet-dev/""") ExecStart=/usr/bin/gunicorn wsgi:application --pid=/run/gunicorn/intranet2.pid --name www-data --user www-data --group www-data --daemon --log-file /var/log/gunicorn/intranet2.log --log-level=info --bind=unix:///tmp/gunicorn-intranet.sock --workers=1
if has('intranet2-server'):
out("""WorkingDirectory=/usr/local/intranet/""")
out("""ExecStart=/usr/bin/gunicorn wsgi:application --pid=/run/gunicorn/intranet2.pid --name www-data --user www-data --group www-data --daemon --log-file /var/log/gunicorn/intranet2.log --log-level=info --bind=unix:///tmp/gunicorn-intranet.sock --workers=1
ExecReload=/bin/kill -s HUP $MAINPID ExecReload=/bin/kill -s HUP $MAINPID
ExecStop=/bin/kill -s TERM $MAINPID ExecStop=/bin/kill -s TERM $MAINPID
Restart=on-failure Restart=on-failure