From 1c254ae9a105c4d6630b6179be70b7188ca814b1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 9 Oct 2015 23:07:57 +0000 Subject: [PATCH] Bunch more work on infinoted --- playbooks/groups/infinote.yml | 9 +++++++ .../files/cgit-projects-infinote | 1 + roles/cgit/make_pkgs_list/tasks/main.yml | 4 +++ roles/infinote/files/infinoted.service | 11 ++++++++ roles/infinote/tasks/main.yml | 19 ++++++++++++++ roles/infinote/templates/infinoted.conf | 26 +++++++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 roles/cgit/make_pkgs_list/files/cgit-projects-infinote create mode 100644 roles/infinote/files/infinoted.service create mode 100644 roles/infinote/templates/infinoted.conf diff --git a/playbooks/groups/infinote.yml b/playbooks/groups/infinote.yml index fb51a7b828..34f165c04c 100644 --- a/playbooks/groups/infinote.yml +++ b/playbooks/groups/infinote.yml @@ -20,6 +20,15 @@ - sudo - collectd/base - openvpn/client + - cgit/base + - cgit/clean_lock_cron + - cgit/make_pkgs_list + - git/server + - role: apache + - role: httpd/mod_ssl + - role: httpd/certificate + name: wildcard-2014.fedorapeople.org + SSLCertificateChainFile: wildcard-2014.fedorapeople.org.intermediate.cert - infinote tasks: diff --git a/roles/cgit/make_pkgs_list/files/cgit-projects-infinote b/roles/cgit/make_pkgs_list/files/cgit-projects-infinote new file mode 100644 index 0000000000..b020a2a611 --- /dev/null +++ b/roles/cgit/make_pkgs_list/files/cgit-projects-infinote @@ -0,0 +1 @@ +infinote.git diff --git a/roles/cgit/make_pkgs_list/tasks/main.yml b/roles/cgit/make_pkgs_list/tasks/main.yml index 574a51199f..bcaa4d1ecb 100644 --- a/roles/cgit/make_pkgs_list/tasks/main.yml +++ b/roles/cgit/make_pkgs_list/tasks/main.yml @@ -25,6 +25,10 @@ copy: src=cgit-projects-batcave dest=/etc/cgit-projects-batcave mode=0644 when: inventory_hostname.startswith('batcave') +- name: install the file for infinote + copy: src=cgit-projects-infinote dest=/etc/cgit-projects-infinote mode=0644 + when: inventory_hostname.startswith('infinote') + - name: install the cron job cron: > name="make-cgit-pkgs-list" cron_file="ansible-make-cgit-pkgs-list" diff --git a/roles/infinote/files/infinoted.service b/roles/infinote/files/infinoted.service new file mode 100644 index 0000000000..252947c18d --- /dev/null +++ b/roles/infinote/files/infinoted.service @@ -0,0 +1,11 @@ +[Unit] +Description=infinoted server +After=network.target +Documentation=https://github.com/gobby/libinfinity + +[Service] +ExecStart=/usr/bin/infinoted-0.6 +Type=simple + +[Install] +WantedBy=multi-user.target diff --git a/roles/infinote/tasks/main.yml b/roles/infinote/tasks/main.yml index bc61d6c226..d732acbe0e 100644 --- a/roles/infinote/tasks/main.yml +++ b/roles/infinote/tasks/main.yml @@ -27,3 +27,22 @@ tags: - infinote - config + +- name: add systemd unit file to start infinote daemon + copy: src=infinoted.service dest=/etc/system/systemd/infinoted.service + notify: reload systemd service files + tags: + - infinote + - config + +- name: enable infinoted + action: service name=infinoted state=running enabled=true + tags: + - infinote + - config + +- name: add config file for infinoted + template: src=infinoted.conf dest=/etc/xdg/infinoted.conf + tags: + - infinote + - config diff --git a/roles/infinote/templates/infinoted.conf b/roles/infinote/templates/infinoted.conf new file mode 100644 index 0000000000..68256ec199 --- /dev/null +++ b/roles/infinote/templates/infinoted.conf @@ -0,0 +1,26 @@ +[infinoted] +certificate-file=/etc/pki/tls/certs/wildcard-2014.fedoraproject.org.cert +key-file=/etc/pki/tls/private/wildcard-2014.fedoraproject.org.key +certificate-chain=/etc/pki/tls/certs/wildcard-2014.fedoraproject.org.intermediate.cert +port=6522 +security-policy=require-tls +root-directory=/srv/infinote +plugins=note-text,autosave,directory-sync,logging +password="{{ infinote-password }}" + +[autosave] +interval=60 +# TODO: write git hook. https://github.com/gobby/gobby/wiki/PluginAutosave +#hook= + +[directory-sync] +directory=/srv/web/infinote +interval=10 +# TODO: write git hook. https://github.com/gobby/gobby/wiki/PluginDirectorySync +#hook= + +[logging] +log-connections=true +log-connection-errors=true +log-session-errors=true +log-session-request-extra=true