gitea finished

gitea/cpapache.sls

@@ -1,7 +1,35 @@
-{#
-vim /etc/apache2/conf.d/userdata/std/2/keiran5/git.keiran.us/git.keiran.us.conf
-/scripts/verify_vhost_includes --commit /scripts/ensure_vhost_includes --all-users
-/scripts/rebuildhttpdconf
-/usr/local/cpanel/scripts/restartsrv_httpd --graceful
-go to http://git.keiran.us/install
-#}
+
+{{ salt.pillar.get('gitea:cpapache_include') }}:
+  file.managed:
+    - source: 'salt://gitea/files/vhost_include.jinja'
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+
+verify_vhost_includes:
+  cmd.wait:
+    - name: /usr/local/cpanel/scripts/verify_vhost_includes --commit /scripts/ensure_vhost_includes --all-users
+    - watch:
+      - file: {{ salt.pillar.get('gitea:cpapache_include') }}
+
+rebuildhttpdconf:
+  cmd.wait:
+    - name: /usr/local/cpanel/scripts/rebuildhttpdconf
+    - watch:
+      - cmd: verify_vhost_includes
+
+queue_httpd_graceful:
+  cmd.wait:
+    - name: /usr/local/cpanel/scripts/restartsrv_httpd --graceful
+    - watch:
+      - cmd: rebuildhttpdconf
+
+/home/{{ salt.pillar.get('gitea:user') }}/public_html/.htaccess:
+  file.managed:
+    - source: 'salt://gitea/files/htaccess.jinja'
+    - template: jinja
+    - user: {{ salt.pillar.get('gitea:user') }}
+    - group: {{ salt.pillar.get('gitea:user') }}
+    - mode: 644
+