- root@appie:~/puppet# bzr diff
- === modified file 'manifests/site.pp'
- --- manifests/site.pp 2016-01-10 00:11:06 +0000
- +++ manifests/site.pp 2016-01-10 00:53:00 +0000
- @@ -232,9 +232,11 @@
- "code.bitlbee.org",
- "get.bitlbee.org",
- "wiki.bitlbee.org",
- + "bugs.bitlbee.org",
- ],
- uwsgi_apps => [
- "moin.ini",
- + "trac.ini",
- ],
- }
- @@ -242,7 +244,7 @@
- source => "puppet:///modules/files/moin/mywiki.py",
- }
- - package { "trac":
- + package { "trac", "git":
- ensure => installed,
- }
- }
- === added file 'site/modules/nginx/files/sites/bugs.bitlbee.org'
- --- site/modules/nginx/files/sites/bugs.bitlbee.org 1970-01-01 00:00:00 +0000
- +++ site/modules/nginx/files/sites/bugs.bitlbee.org 2016-01-10 00:50:57 +0000
- @@ -0,0 +1,35 @@
- +server {
- + listen 80;
- + listen [::]:80;
- +
- + # SSL configuration
- + # And this one's the default/fallback server
- + #
- + listen 443 ssl;
- + listen [::]:443 ssl;
- +
- + ssl_certificate /etc/letsencrypt/live/bitlbee.org/fullchain.pem;
- + ssl_certificate_key /etc/letsencrypt/live/bitlbee.org/privkey.pem;
- +
- + root /var/www/org/bitlbee/bugs;
- +
- + index index.html index.htm index.nginx-debian.html;
- +
- + server_name bugs.bitlbee.org;
- +
- + location / {
- + uwsgi_pass unix:/var/tmp/trac.sock;
- + include uwsgi_params;
- + }
- +
- + location /chrome {
- + alias /var/www/org/bitlbee/bugs/bitlbee/chrome;
- + }
- +
- + # deny access to .htaccess files, if Apache's document root
- + # concurs with nginx's one
- + #
- + location ~ /\.ht {
- + deny all;
- + }
- +}
- === added file 'site/modules/nginx/files/uwsgi/trac.ini'
- --- site/modules/nginx/files/uwsgi/trac.ini 1970-01-01 00:00:00 +0000
- +++ site/modules/nginx/files/uwsgi/trac.ini 2016-01-10 00:20:42 +0000
- @@ -0,0 +1,14 @@
- +[uwsgi]
- +uid = www-data
- +gid = www-data
- +socket = /var/tmp/trac.sock
- +chmod-socket = 660
- +
- +chdir = /var/www/org/bitlbee/bugs/
- +wsgi-file = /var/www/org/bitlbee/bugs/trac.wsgi
- +
- +[master]
- +workers = 3
- +max-requests = 200
- +harakiri = 30
- +die-on-term