Merge branch 'master' into archweb_uwsgi

hosts

@@ -9,3 +9,6 @@ apollo.archlinux.org
 
 [soyuz]
 soyuz.archlinux.org
+
+[luna]
+luna.archlinux.org

playbooks/all-hosts-basic.yml

+---
+
+- name: basic setup for all hosts
+  hosts: all
+  remote_user: root
+  roles:
+    # common reconfigures the network. will berak old hosts
+    #- { role: common, tags: ['common'] }
+    - { role: tools, tags: ['tools'] }
+    # reconfiguring sshd may break the AUR on luna (unchecked)
+    #- { role: sshd, tags: ['sshd'] }
+    - { role: root_ssh, tags: ['root_ssh'] }
+    # borg-client needs to be adapted to use the hostname instead of hardcoded values
+    # here. this also probably doesn't work nicely for old hosts yet
+    #- { role: borg-client, backup_host: "borg@vostok.archlinux.org", backup_dir: "/backup/apollo", postgres_backup_dir: "/var/lib/postgres/backup", tags: ["borg"] }

roles/archbuild/files/gitpkg

@@ -258,7 +258,7 @@ class Repo
       loop do
         puts
         if (ref = Readline.readline("Enter ref (or nothing to view all): ", true).strip).empty?
-          system('tig', '--all', '--date-order') or log('--graph', '--all', '--oneline')
+          system('tig', '--branches', '--tags', '--date-order') or log('--graph', '--branches', '--tags', '--oneline')
         else
           begin
             commit = resolve ref

roles/nginx/files/nginx.service.d

+[Service]
+StandardOutput=null

roles/nginx/tasks/main.yml

@@ -3,6 +3,9 @@
 - name: install nginx
   pacman: name=nginx,certbot state=present
 
+- name: install nginx.service snippet
+  copy: src=nginx.service.d dest=/etc/systemd/system/nginx.service.d/local.conf owner=root group=root mode=0644
+
 - name: configure nginx
   template: src=nginx.conf.j2 dest=/etc/nginx/nginx.conf owner=root group=root mode=0644
   notify:

roles/nginx/templates/nginx.conf.j2

@@ -4,6 +4,8 @@ events {
     worker_connections  1024;
 }
 
+error_log syslog:server=unix:/dev/log,nohostname info;
+
 http {
     include       mime.types;
     default_type  application/octet-stream;
@@ -14,8 +16,7 @@ http {
 
     index  index.php index.html index.htm;
 
-    access_log   /var/log/nginx/default/access.log;
-    error_log    /var/log/nginx/default/error.log;
+    access_log syslog:server=unix:/dev/log,nohostname,tag=nginx_http;
 
     include snippets/sslsettings.conf;
 

roles/quassel/tasks/main.yml

@@ -48,7 +48,7 @@
   file: state=directory path=/etc/systemd/system/quassel.service.d owner=root group=root mode=0755
 
 - name: install quassel.service snippet
-  template: src=quassel.service.d.j2 dest=/etc/systemd/system/quassel.service.d/local.conf owner=root group=root mode=0644
+  copy: src=quassel.service.d dest=/etc/systemd/system/quassel.service.d/local.conf owner=root group=root mode=0644
 
 - name: install givemequassel script
   copy: src=givemequassel dest=/usr/local/bin/givemequassel owner=root group=root mode=0755