Browse Source

Fixed small issues in gitit role etc.

Till Klocke 9 years ago
parent
commit
5d5c5a2583

+ 1 - 1
roles/internal/ffdo.gitit/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 # defaults file for ffdo.gitit
 
-gitit_data_dir: /src/gitit
+gitit_data_dir: /srv/gitit
 gitit_user: gitit
 gitit_group: gitit
 gitit_wiki_title: Freifunk-Dortmund-Wiki

+ 4 - 4
roles/internal/ffdo.gitit/tasks/main.yml

@@ -58,10 +58,10 @@
     state: directory
     owner: "{{gitit_user}}"
 
-- name: Clone wiki repo
-  git:
-    src: "{{gitit_wiki_repo}}"
-    dest: "{{gitit_data_dir}}/wikidata"
+#- name: Clone wiki repo
+#  git:
+#    src: "{{gitit_wiki_repo}}"
+#    dest: "{{gitit_data_dir}}/wikidata"
 
 # TODO restore user data
 

+ 0 - 0
roles/internal/ffdo.gitit/templates/footer.st.j2


+ 10 - 11
roles/internal/ffdo.gitit/templates/systemd.j2

@@ -1,14 +1,13 @@
-[program:gitit]
+[Unit]
+Description=gitit
+
+[Service]
 Environment=LANG=de_DE.UTF-8
 Environment=LC_ALL=de_DE.UTF-8
 Environment=LC_LANG=de_DE.UTF-8
-command=/usr/bin/gitit -f {{gitit_data_dir}}/gitit.conf -l 127.0.0.1
-autostart=true
-autorestart=true
-startretries=10
-user={{gitit_user}}
-directory={{gitit_data_dir}}
-redirect_stderr=true
-stdout_logfile={{gluon_collector_log_path}}
-stdout_logfile_maxbytes=5MB
-stdout_logfile_backups=10
+ExecStart=/usr/bin/gitit -f {{gitit_data_dir}}/gitit.conf -l 127.0.0.1
+Restart=on-failure
+User={{gitit_user}}
+
+[Install]
+WantedBy=multi-user.target

+ 2 - 1
roles/internal/ffdo.gluon-collector/templates/config.j2

@@ -21,4 +21,5 @@ store:
 
 http:             
   port: {{gluon_collector_http_port}}              
-  address: "{{gluon_collector_http_address}}"
+  address: "{{gluon_collector_http_address}}"
+