refactored for openbsd setup

3 files changed, 2 insertions, 71 deletions

diff --git a/roles/setup_git/tasks/main.yml b/roles/setup_git/tasks/main.yml
index 2383a7c..b2b2d73 100644
--- a/roles/setup_git/tasks/main.yml
+++ b/roles/setup_git/tasks/main.yml
@@ -15,21 +15,6 @@
     name: git
     state: present
 
-- name: Check installation of lighttpd
-  package:
-    name: lighttpd
-    state: present
-
-- name: Check installation of libcgi
-  package:
-    name: libcgi-pm-perl
-    state: present
-
-- name: Check installation of gamin
-  package:
-    name: gamin
-    state: present
-
 - name: Add group git
   user:
     name: "{{ git_group }}"
@@ -47,8 +32,8 @@
     state: present
     key: "{{ item }}"
   with_file:
-    - "{{ playbook_dir }}/files/public_keys/WS-bentonite"
-    - "{{ playbook_dir }}/files/public_keys/LP-graphite"
+    - "{{ playbook_dir }}/files/pub_ssh/WS-bentonite"
+    - "{{ playbook_dir }}/files/pub_ssh/LP-graphite"
 
 - name: Create git directory
   file:
@@ -59,30 +44,3 @@
     mode: 0755
     recurse: True
 
-- name: Create default gitweb directory
-  file:
-    path: "{{ git_directory_path }}/{{ git_gitweb_default_repository }}"
-    state: directory
-    owner: "{{ git_user }}"
-    group: "{{ git_group }}"
-    mode: 0755
-
-- name: Init gitweb repository
-  command: git init "{{ git_directory_path }}/{{ git_gitweb_default_repository }}"
-  become_user: "{{ git_user }}"
-
-- name: Copy gitweb systemd unit
-  template:
-    src: "{{ git_gitweb_unit }}.service"
-    dest: "{{ g_systemd_unit_directory }}"
-    owner: root
-    group: root
-    mode: 0644
-
-- name: Start gitweb systemd unit
-  systemd:
-    name: "{{ git_gitweb_unit }}"
-    state: restarted
-    daemon_reload: yes
-    enabled: yes
-
diff --git a/roles/setup_git/templates/gitweb.service b/roles/setup_git/templates/gitweb.service
deleted file mode 100644
index 12e1eb4..0000000
--- a/roles/setup_git/templates/gitweb.service
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# =========================================================================== #
-#                   _ __             _ __ 
-#      __  ______  (_) /_     ____ _(_) /_
-#     / / / / __ \/ / __/    / __ `/ / __/
-#    / /_/ / / / / / /__    / /_/ / / /_  
-#    \__,_/_/ /_/_/\__(_)   \__, /_/\__/  
-#                          /____/   
-#
-# =========================================================================== #
-
-[Unit]
-Description=Gitweb interface for git repositories
-
-[Service]
-Type=forking
-User={{ git_user }}
-Group={{ git_group }}
-WorkingDirectory={{ git_directory_path }}/{{ git_gitweb_default_repository }}
-ExecStart=/usr/bin/git instaweb --port={{ g_port_gitweb_gui }}
-ExecStop=/bin/kill -s HUP $MAINPID
-RuntimeDirectoryMode=0700
-
-[Install]
-WantedBy=default.target
diff --git a/roles/setup_git/vars/main.yml b/roles/setup_git/vars/main.yml
index 74983b0..b4f5e64 100644
--- a/roles/setup_git/vars/main.yml
+++ b/roles/setup_git/vars/main.yml
@@ -13,6 +13,4 @@
 git_user: git
 git_user_comment: handles git repositories and gitweb service
 git_group: git
-git_gitweb_unit: gitweb
-git_gitweb_default_repository: __default
 git_directory_path: /srv/git