testing

dev/proxy.yml

@@ -5,8 +5,7 @@
     - host_vars/proxy.yml
   roles:
     - base
-    - postgresql
     - proxy
     - docker
-    - gitea
     - bitwarden
+    - gitea

roles/bitwarden/defaults/main.yml

@@ -1,5 +1,5 @@
 bitwarden_name: bitwarden
-bitwarden_root: "{{ docker_root }}/{{ bitwarden_name }}"
+bitwarden_root: "/opt/{{ bitwarden_name }}"
 bitwarden_database: "{{ bitwarden_name }}"
 bitwarden_standalone: false
 bitwarden_production: false

roles/bitwarden/handlers/main.yml

@@ -1,16 +1,7 @@
-- name: Stop Bitwarden for rebuild
-  service:
-    name: "{{ bitwarden_name }}"
-    state: stopped
-  listen: rebuild_bitwarden
-
 - name: Rebuild Bitwarden
   shell: "{{ bitwarden_root }}/bitwarden.sh rebuild"
   listen: rebuild_bitwarden
 
-- name: Start Bitwarden after rebuild
+- name: Start Bitwarden
-  service:
+  shell: "{{ bitwarden_root }}/bitwarden.sh start"
-    name: "{{ bitwarden_name }}"
+  listen: start_bitwarden
-    state: started
-    enabled: true
-  listen: rebuild_bitwarden

roles/bitwarden/tasks/main.yml

@@ -25,13 +25,16 @@
   shell: "{{ bitwarden_root }}/bw_wrapper"
   args:
     creates: "{{ bitwarden_root }}/bwdata/config.yml"
+  notify: start_bitwarden
 
 - name: Install docker-compose override
   template:
     src: compose.override.yml.j2
     dest: "{{ bitwarden_root }}/bwdata/docker/docker-compose.override.yml"
   when: traefik_version is defined
-  notify: rebuild_bitwarden
+  notify:
+    - rebuild_bitwarden
+    - start_bitwarden
 
 - name: Disable bitwarden-nginx HTTP on 80
   replace:
@@ -39,7 +42,9 @@
     regexp: "^http_port: 80$"
     replace: "http_port: 8080"
   when: not bitwarden_standalone
-  notify: rebuild_bitwarden
+  notify:
+    - rebuild_bitwarden
+    - start_bitwarden
 
 - name: Disable bitwarden-nginx HTTPS on 443
   replace:
@@ -47,7 +52,9 @@
     regexp: "^https_port: 443$"
     replace: "https_port: 8443"
   when: not bitwarden_standalone
-  notify: rebuild_bitwarden
+  notify:
+    - rebuild_bitwarden
+    - start_bitwarden
 
 - name: Disable Bitwarden managed Lets Encrypt
   replace:
@@ -55,7 +62,9 @@
     regexp: "^ssl_managed_lets_encrypt: true$"
     replace: "ssl_managed_lets_encrypt: false"
   when: not bitwarden_standalone or not bitwarden_production
-  notify: rebuild_bitwarden
+  notify:
+    - rebuild_bitwarden
+    - start_bitwarden
 
 - name: Disable Bitwarden managed SSL
   replace:
@@ -63,17 +72,6 @@
     regexp: "^ssl: true$"
     replace: "ssl: false"
   when: not bitwarden_standalone
-  notify: rebuild_bitwarden
+  notify:
-
+    - rebuild_bitwarden
-- name: Install Bitwarden systemd service
+    - start_bitwarden
-  template:
-    src: bitwarden.service.j2
-    dest: "/etc/systemd/system/{{ bitwarden_name }}.service"
-  register: bitwarden_systemd
-  notify: rebuild_bitwarden
-
-- name: Reload systemd manager configuration
-  systemd:
-    daemon_reload: true
-  when: bitwarden_systemd.changed
-  notify: rebuild_bitwarden

roles/bitwarden/templates/bitwarden.service.j2

@@ -1,13 +0,0 @@
-[Unit]
-Description=Bitwarden Password Manager Server
-PartOf=docker.service
-After=docker.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart={{ bitwarden_root }}/bitwarden.sh start
-ExecStop={{ bitwarden_root }}/bitwarden.sh stop
-
-[Install]
-WantedBy=multi-user.target

roles/docker/defaults/main.yml

@@ -1,3 +1 @@
-docker_root: /var/lib/docker-compose
 docker_compose: /usr/bin/docker-compose
-docker_compose_service: compose

roles/docker/tasks/main.yml

@@ -4,22 +4,6 @@
     state: present
     update_cache: true
 
-- name: Create docker-compose root
-  file:
-    path: "{{ docker_root }}"
-    state: directory
-
-- name: Install docker-compose systemd service
-  template:
-    src: docker-compose.service.j2
-    dest: "/etc/systemd/system/{{ docker_compose_service }}@.service"
-  register: compose_systemd
-
-- name: Reload systemd manager configuration
-  systemd:
-    daemon_reload: true
-  when: compose_systemd.changed
-
 - name: Add users to docker group
   user:
     name: "{{ item }}"

roles/docker/templates/docker-compose.service.j2

@@ -1,5 +1,5 @@
 [Unit]
-Description=%i docker-compose service
+Description=%i docker service
 PartOf=docker.service
 After=docker.service
 

roles/gitea/defaults/main.yml

@@ -3,8 +3,6 @@ gitea_name: gitea
 gitea_sshport: "222"
 gitea_webport: "3000"
 gitea_volume: "{{ gitea_name }}"
-gitea_rooturl: "http://{{ gitea_domain }}"
-gitea_signup: true
 
 # database settings
 gitea_dbtype: postgres
@@ -13,4 +11,4 @@ gitea_dbname: "{{ gitea_name }}"
 gitea_dbuser: "{{ gitea_name }}"
 
 # host
-gitea_root: "{{ docker_root }}/{{ gitea_name }}"
+gitea_root: "/opt/{{ gitea_name }}"

roles/gitea/handlers/main.yml

@@ -0,0 +1,4 @@
+- name: Reload systemd manager configuration
+  systemd:
+    daemon_reload: true
+  listen: gitea_systemd

roles/gitea/tasks/main.yml

@@ -3,16 +3,6 @@
     path: "{{ gitea_root }}"
     state: directory
 
-- name: Create gitea database
-  postgresql_db:
-    name: "{{ gitea_dbname }}"
-
-- name: Create gitea database user
-  postgresql_user:
-    db: "{{ gitea_dbname }}"
-    name: "{{ gitea_dbuser }}"
-    password: "{{ gitea_dbpass }}"
-
 - name: Install Gitea's docker-compose file
   template:
     src: docker-compose.yml.j2
@@ -23,8 +13,19 @@
     src: compose-env.j2
     dest: "{{ gitea_root }}/.env"
 
-- name: Start and enable Gitea service
+- name: Install Gitea systemd service
+  template:
+    src: gitea.service.j2
+    dest: "/etc/systemd/system/{{ gitea_name }}.service"
+  register: gitea_systemd
+
+- name: Reload systemd manager configuration
+  systemd:
+    daemon_reload: true
+  when: gitea_systemd.changed
+
+- name: Start and enable Gitea
   service:
-    name: "{{ docker_compose_service }}@{{ gitea_name }}"
+    name: "{{ gitea_name }}"
     state: started
     enabled: true

roles/gitea/templates/compose-env.j2

@@ -1,8 +1,6 @@
 # {{ ansible_managed }}
 gitea_version={{ gitea_version }}
 gitea_name={{ gitea_name }}
-gitea_domain={{ gitea_domain }}
-gitea_rooturl={{ gitea_rooturl }}
 gitea_webport={{ gitea_webport }}
 gitea_sshport={{ gitea_sshport }}
 gitea_dbtype={{ gitea_dbtype }}
@@ -10,8 +8,3 @@ gitea_dbhost={{ gitea_dbhost }}
 gitea_dbname={{ gitea_dbname }}
 gitea_dbuser={{ gitea_dbuser }}
 gitea_dbpass={{ gitea_dbpass }}
-{% if not gitea_signup %}
-gitea_disable_registration=true
-{% else %}
-gitea_disable_registration=false
-{% endif %}

roles/gitea/templates/docker-compose.yml.j2

@@ -5,22 +5,17 @@ services:
     image: "gitea/gitea:${gitea_version}"
     container_name: "${gitea_name}"
     ports:
+      - "${gitea_webport}:3000"
       - "${gitea_sshport}:22"
-      - "127.0.0.1:${gitea_webport}:3000"
+      - "127.0.0.1:5432:5432"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
     environment:
       - USER_UID=1000
       - USER_GID=1000
-      - GITEA__server__ROOT_URL=${gitea_rooturl}
-      - GITEA__server__DOMAIN=${gitea_domain}
-      - GITEA__server__SSH_DOMAIN=${gitea_domain}
       - GITEA__database__DB_TYPE=${gitea_dbtype}
       - GITEA__database__HOST=${gitea_dbhost}
       - GITEA__database__NAME=${gitea_dbname}
       - GITEA__database__USER=${gitea_dbuser}
       - GITEA__database__PASSWD=${gitea_dbpass}
-      - GITEA__service__DISABLE_REGISTRATION=${gitea_disable_registration}
     volumes:
       - {{ gitea_volume }}:/data
       - /etc/timezone:/etc/timezone:ro

roles/gitea/templates/gitea.service.j2

@@ -0,0 +1,14 @@
+[Unit]
+Description=Gitea Docker Service
+PartOf=docker.service
+After=docker.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+WorkingDirectory={{ gitea_root }}/
+ExecStart={{ docker_compose }} up -d --remove-orphans
+ExecStop={{ docker_compose }} down
+
+[Install]
+WantedBy=multi-user.target

roles/proxy/tasks/main.yml

@@ -62,7 +62,6 @@
   file:
     path: /etc/letsencrypt/renewal-hooks/post
     state: directory
-  when: proxy.production is defined and proxy.production
 
 - name: Install nginx post renewal hook
   copy:

roles/proxy/templates/server-nginx.conf.j2

@@ -1,11 +1,3 @@
-{% if item.https is not defined or item.https %}
-server {
-    listen 80;
-
-    server_name {{ item.domain }};
-    return 301 https://{{ item.domain }}$request_uri;
-}
-{% endif %}
 server {
   listen              443 ssl;
   server_name         {{ item.domain }};