Fixed some issues with laradev

pillars/roles/laradev/bbs.sls

@@ -1,3 +1,3 @@
 laradev:
   bbs:
-    repo: "https://git.actcur.com/bowens/web.git"
+    repo: "ssh://gogs@git.actcur.com:5022/bowens/web.git"

pillars/roles/laradev/clark-family.sls

@@ -1,3 +1,3 @@
 laradev:
   clark:
-    repo: "https://git.actcur.com/karenp/Clark-family.git"
+    repo: "ssh://gogs@git.actcur.com:5022/karenp/Clark-family.git"

pillars/roles/laradev/init.sls

@@ -4,13 +4,10 @@ include:
 
 {%- if grains['roles'] is defined -%}
   {%- if grains['roles'] is not none -%}
-    {%- if 'laradev' in grains['roles'] -%}
+    {%- for role in grains['roles'] %}
-      {%- for state in states %}
+      {%- if 'pillars.roles.laradev.'+role in states %}
-        {%- if state.startswith("pillars.roles.laradev.") -%}
-          {%- set role = state.split('.')[3] %}
   - roles.laradev.{{ role }}
-        {%- endif -%}
+      {%- endif -%}
-      {%- endfor -%}
+    {%- endfor -%}
-    {%- endif -%}
   {%- endif -%}
 {%- endif -%}

pillars/roles/laradev/ra.sls

@@ -1,3 +1,3 @@
 laradev:
   ra:
-    repo: "https://git.actcur.com/redactedaudio/web.git"
+    repo: "ssh://gogs@git.actcur.com:5022/redactedaudio/web.git"

pillars/roles/nginx/clark-family.sls

@@ -2,8 +2,8 @@ nginx:
   clark:
     auth: none
     https:
-      port: 4433
+      port: 8080
-      prot: https
+      prot: http
 
 portal:
   Dev:

states/roles/maintain/laradev/init.sls

@@ -68,24 +68,8 @@ laradev-nginx-conf:
 
 {%- if pillar['laradev'] is defined -%}
 {%- for server in pillar['laradev'] %}
-"laradev-certs/{{server}}.actcur.com/":
+/etc/nginx/conf.d/laradev-{{ server }}.conf:
-  file.recurse:
-    - name: /etc/nginx/certs/{{server}}.actcur.com/
-    - source: salt://secure/certs/{{server}}.actcur.com/
-{%- if os=="CentOS" or os=="RedHat" %}
-    - user: nginx
-    - user: nginx
-{%- elif os=="Arch" or os=="Manjaro" %}
-    - user: http
-    - group: http
-{%- endif %}
-    - dir_mode: 755
-    - file_mode: 400
-    - clean: true
-
-laradev-nginx-{{ server }}.conf:
   file.managed:
-    - name: /etc/nginx/conf.d/{{ server }}.conf
     - makedirs: true
     - source: salt://roles/maintain/laradev/nginx.conf
     - user: root
@@ -136,3 +120,17 @@ laradev-nginx-{{ server }}.conf:
 "git_branches.timer":
   service.running:
     - enable: true
+
+/root/.ssh/config:
+  file.managed:
+    - source: salt://roles/maintain/laradev/ssh_config
+    - user: root
+    - group: root
+    - mode: 644
+
+/root/.ssh/git_actcur:
+  file.managed:
+    - source: salt://secure/keys/git/git_actcur
+    - user: root
+    - group: root
+    - mode: 600

states/roles/maintain/laradev/nginx.conf

@@ -1,12 +1,8 @@
 server {
-    listen 443;
+    listen 8080;
-    server_name {{server}}.actcur.com;
+    server_name {{server}};
     root /sites/{{server}};
 
-    ssl on;
-    ssl_certificate /etc/nginx/certs/{{server}}.actcur.com/fullchain.pem;
-    ssl_certificate_key /etc/nginx/certs/{{server}}.actcur.com/privkey.pem;
-
     index index.html index.htm index.php;
 
     charset utf-8;
@@ -38,4 +34,4 @@ server {
     }
     error_log /var/log/nginx/ra_error.log notice;
     access_log /var/log/nginx/ra_access.log;
-}
+}

states/roles/maintain/laradev/ssh_config

@@ -0,0 +1,5 @@
+Host git.actcur.com
+  Hostname git.actcur.com
+  Port 5022
+  User gogs
+  IdentityFile ~/.ssh/git_actcur