Updated git.pm (re-added its ipv6 address).

diff --git a/sources/git.pm/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/git.pm/c3d/firstboot/scripts/01_setupnetworking.sh
index e8918cf6ad7534992fa3711cd65330b0fdc7a4ab..062dd874d9dfc58693d5e0638f4e59e9b55366dc 100755 (executable)
--- a/sources/git.pm/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/git.pm/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -62,24 +62,23 @@ CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
-#    ipv6.addresses "2a02:d400:0000:f2ad:000c:18ff:fe03:ad4f/64" \
-#    ipv6.dns "2a02:d400:0000:f2ad:000c:18ff:fe03:adae" \
-#    ipv6.dns-search "pm.useribm.hu" \
-#    ipv6.gateway "2a02:d400:0000:f2ad:000c:18ff:fe03:adfe" \
-#    ipv6.routes "2a02:d400:0000:f268::/64 2a02:d400:0000:f2ad:000c:18ff:fe03:ad01" \
-#    ipv6.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id perimeter \
     connection.interface-name $CONNECTION_DEVICE \
     connection.type 802-3-ethernet \
-    ipv4.addresses "192.168.173.79/24" \
-    ipv4.dns "192.168.173.174" \
+    ipv4.addresses "192.168.173.42/24" \
+    ipv4.dns "192.168.173.223" \
     ipv4.dns-search "pm.useribm.hu" \
     ipv4.gateway "192.168.173.254" \
     ipv4.method "manual" \
     ipv4.routes "10.228.0.0/16 192.168.173.1" \
-    ipv6.method "disabled" \
+    ipv6.addresses "2001:1aa1:000a:7c0c:000c:18ff:fe03:ad2a/64" \
+    ipv6.dns "2001:1aa1:000a:7c0c:000c:18ff:fe03:addf" \
+    ipv6.dns-search "pm.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:7c0c:000c:18ff:fe03:adfe" \
+    ipv6.method "manual" \
+    ipv6.routes "2001:1aa1:000a:7dae::/64 2001:1aa1:000a:7c0c:000c:18ff:fe03:ad01" \
     save yes
 
 nmcli connection show

diff --git a/sources/git.pm/c3d/postinstall/install-data/etc/httpd/conf.d/git.conf b/sources/git.pm/c3d/postinstall/install-data/etc/httpd/conf.d/git.conf
index 0d83ac26ff34b1ab4026ae330e9bb76524b0b214..8e6674e30a863140662237fda89106c2372ed114 100644 (file)
--- a/sources/git.pm/c3d/postinstall/install-data/etc/httpd/conf.d/git.conf
+++ b/sources/git.pm/c3d/postinstall/install-data/etc/httpd/conf.d/git.conf
@@ -27,11 +27,17 @@
         AuthType Basic
         AuthBasicProvider ldap
         AuthLDAPURL "ldap://fds.useribm.hu/ou=People, dc=user, dc=hu"
-        <If "%{QUERY_STRING} =~ /^p=lis.git/">
-            Require ldap-user akosztolanyi dvasary kkele rrendek
-        </If>
-        <ElseIf "%{QUERY_STRING} =~ /^p=mediacube.git/">
+        <If "%{QUERY_STRING} =~ /^p=mediacube.git/">
             Require ldap-user dvasary rrendek
+        </If>
+        <ElseIf "%{QUERY_STRING} =~ /^p=mki-fd.git/">
+            Require ldap-user dvasary fschnell
+        </ElseIf>
+        <ElseIf "%{QUERY_STRING} =~ /^p=nim.git/">
+            Require ldap-user zfelleg
+        </ElseIf>
+        <ElseIf "%{QUERY_STRING} =~ /^p=sly-crm.git/">
+            Require ldap-user akosztolanyi dvasary kkele mszabo rrendek
         </ElseIf>
         <ElseIf "%{QUERY_STRING} =~ /^p=user-lxc.git/">
             Require ldap-user zfelleg
@@ -51,11 +57,17 @@
         AuthType Basic
         AuthBasicProvider ldap
         AuthLDAPURL "ldap://fds.useribm.hu/ou=People, dc=user, dc=hu"
-        <If "%{REQUEST_URI} =~ m#^/git/lis.git#">
-            Require ldap-user akosztolanyi dvasary kkele rrendek
-        </If>
-        <ElseIf "%{REQUEST_URI} =~ m#^/git/mediacube.git#">
+        <If "%{REQUEST_URI} =~ m#^/git/mediacube.git#">
             Require ldap-user dvasary rrendek
+        </If>
+        <ElseIf "%{REQUEST_URI} =~ m#^/git/mki-fd.git#">
+            Require ldap-user dvasary fschnell
+        </ElseIf>
+        <ElseIf "%{REQUEST_URI} =~ m#^/git/nim.git#">
+            Require ldap-user zfelleg
+        </ElseIf>
+        <ElseIf "%{REQUEST_URI} =~ m#^/git/sly-crm.git#">
+            Require ldap-user akosztolanyi dvasary kkele mszabo rrendek
         </ElseIf>
         <ElseIf "%{REQUEST_URI} =~ m#^/git/user-lxc.git#">
             Require ldap-user zfelleg