Browse Source

replace git.c3pb.de by git.ffho.net

Karsten Böddeker 6 years ago
parent
commit
c5ece1930c
4 changed files with 6 additions and 35 deletions
  1. 2 11
      build/init.sls
  2. 3 4
      fastd/peers.sls
  3. 0 11
      ffho_base/init.sls
  4. 1 9
      firmware/init.sls

+ 2 - 11
build/init.sls

@@ -58,14 +58,13 @@ build-git:
     - require:
       - user: build
   git.latest:
-    - name: git@git.c3pb.de:freifunk-pb/firmware.git
+    - name: gogs@git.ffho.net:FreifunkHochstift/ffho-firmware-build.git
     - target: /srv/build
     - user: build
     - update_head: False
     - require:
       - pkg: build
       - user: build
-      - ssh_known_hosts: git.c3pb.de
       - file: /home/build/.ssh/id_rsa
       - file: build-git
 
@@ -77,7 +76,7 @@ firmware-git:
     - require:
       - git: build-git
   git.latest:
-    - name: git@git.c3pb.de:freifunk-pb/firmware-website.git
+    - name: gogs@git.ffho.net:FreifunkHochstift/ffho-firmware-website.git
     - target: /srv/build/output
     - branch: signing
     - user: build
@@ -111,14 +110,6 @@ firmware-git:
     - require:
       - file: /srv/build/opkg-keys
 
-git.c3pb.de:
-  ssh_known_hosts.present:
-    - user: build
-    - enc: ecdsa
-    - fingerprint: 51:2a:f4:f4:71:c8:69:8c:96:db:54:b7:f0:36:e5:60
-    - require:
-      - user: build
-
 firmware.in.ffho.net:
   ssh_known_hosts.present:
     - user: build

+ 3 - 4
fastd/peers.sls

@@ -1,8 +1,8 @@
 #
-# FFPB Gateways specific stuff
+# FFHO Gateways specific stuff
 #
 
-# include ffpb stuff (git.c3pb.pubkey, ffpb.id_rsa)
+# include ffho stuff (ffho.id_rsa)
 include:
   - ffho_base
   - keys
@@ -10,13 +10,12 @@ include:
 # Pull fastd mesh peers git
 peers-git:
   git.latest:
-    - name: git@git.c3pb.de:freifunk-sensitive/knoten.git
+    - name: gogs@git.ffho.net:ffho-sensitive/ffho-knoten.git
     - target: /etc/freifunk/peers
     - rev: master
     - identity: /root/.ssh/ffho_peers_git.id_rsa
     - user: root
     - require:
-      - ssh_known_hosts: git.c3pb.pubkey
       - file: /root/.ssh/ffho_peers_git.id_rsa
 
 # Update script

+ 0 - 11
ffho_base/init.sls

@@ -9,17 +9,6 @@ ffho_packages:
       - openssl
       - netcat-openbsd
 
-
-# SSH fingerprint of gitlab on git.c3pb.de
-git.c3pb.pubkey:
-  ssh_known_hosts:
-    - name: git.c3pb.de
-    - present
-    - user: root
-    - enc: ecdsa
-    - fingerprint: 51:2a:f4:f4:71:c8:69:8c:96:db:54:b7:f0:36:e5:60
-
-
 /usr/local/bin/ff_log_to_bot:
   file.managed:
     - source: salt://ffho_base/ff_log_to_bot

+ 1 - 9
firmware/init.sls

@@ -23,7 +23,7 @@ firmware-git:
     - require:
       - user: firmware
   git.latest:
-    - name: git@git.c3pb.de:freifunk-pb/firmware-website.git
+    - name: gogs@git.ffho.net:FreifunkHochstift/ffho-firmware-website.git
     - target: {{salt['pillar.get']('nodes:' ~ grains['id'] ~ ':path:firmware', [])}}
     - user: firmware
     - update_head: False
@@ -32,7 +32,6 @@ firmware-git:
       - user: firmware
       - file: firmware-git
       - file: /home/firmware/.ssh/id_rsa
-      - ssh_known_hosts: git.c3pb.de
 
 firmware-changelog:
   cmd.run:
@@ -46,13 +45,6 @@ firmware-changelog:
       - user: firmware
       - file: /usr/local/sbin/update-firmware
 
-# SSH fingerprint of gitlab
-git.c3pb.de:
-  ssh_known_hosts.present:
-    - user: firmware
-    - enc: ecdsa
-    - fingerprint: 51:2a:f4:f4:71:c8:69:8c:96:db:54:b7:f0:36:e5:60
-
 /home/firmware/.ssh:
   file.directory:
     - user: firmware