ajout gitweb : pb master -> main

gitweb/Vagrantfile

@@ -0,0 +1,88 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "debian/bullseye64"
+  config.vm.hostname = "gitweb"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+   config.vm.provision "shell", inline: <<-SHELL
+     apt-get update
+     apt-get install -y curl wget vim apache2 php 
+     chown -R www-data:www-data /var/www/html/
+     chmod g+w /var/www/html/
+     apt-get install -y git
+     useradd -m -s /bin/bash -d /home/git -c git git
+     gpasswd -a git www-data
+     echo "git:git"|sudo chpasswd
+     su - -c "git init  --bare --shared web" git 
+     su - -c "echo 'ref: refs/heads/main' > web/HEAD" git
+     cat > /home/git/web/hooks/post-update <<-'EOF'
+#!/bin/bash
+GWT=/var/www/html/web
+[[ -e ${GWT} ]] || mkdir -p ${GWT} 
+GIT_WORK_TREE=${GWT} git checkout -f
+EOF
+
+   chmod +x /home/git/web/hooks/post-update
+   chown git:git /home/git/web/hooks/post-update
+   SHELL
+end

k8s/kubernetes-setup/common.yml

@@ -0,0 +1,139 @@
+  - name: Set timezone to Europe/Paris
+    community.general.timezone:
+     name: Europe/Paris
+
+  - name: maj fichier hosts  
+    ansible.builtin.blockinfile:
+      path: /etc/hosts
+      block: |
+        192.168.56.10 k8s-master
+        192.168.56.11 node-1
+        192.168.56.12 node-2
+
+  - name: Forwarding IPv4 and letting iptables see bridged traffic
+    ansible.builtin.blockinfile:
+      path: /etc/modules-load.d/k8s.conf
+      create: yes
+      block: |
+        overlay
+        br_netfilter
+ 
+  - name: charge module overlay 
+    community.general.modprobe:
+      state: present
+      name: overlay
+  
+  - name: charge module overlay et br_netfilter
+    community.general.modprobe:
+      state: present
+      name: br_netfilter
+ 
+  - name: persistance des bridges
+    ansible.builtin.blockinfile:
+      path: /etc/sysctl.d/k8s.conf
+      create: yes
+      block: |
+        net.bridge.bridge-nf-call-iptables  = 1
+        net.bridge.bridge-nf-call-ip6tables = 1
+        net.ipv4.ip_forward                 = 1
+
+  - name: applique les parametres sysctl
+    command: "sysctl --system"
+  
+  - name: Recupere get-docker
+    get_url: 
+      url: "https://get.docker.com"
+      dest: /tmp/get-docker.sh
+
+  - name: lance get-docker - installe docker, containerd ... 
+    command: 'sh /tmp/get-docker.sh'
+
+  - name: Add vagrant user to docker group
+    user:
+      name: vagrant
+      group: docker
+
+  - name: cree repertoire /etc/containerd
+    file:
+      path: /etc/containerd
+      state: directory  
+
+  - name: genere config.toml (containerd)
+    #command: "sudo containerd config default | sudo tee /etc/containerd/config.toml"
+    shell: "containerd config default | tee /etc/containerd/config.toml"
+
+  - name: configure cgroup driver pour systemd (config.toml)
+    replace:
+      path: "/etc/containerd/config.toml"
+      regexp:  'SystemdCgroup = false'
+      replace: 'SystemdCgroup = true'  
+      backup: yes
+
+  - name: redemarre containerd
+    service:
+      name: containerd
+      state: restarted
+      enabled: yes
+
+  - name: Remove swapfile from /etc/fstab
+    mount:
+      name: "{{ item }}"
+      fstype: swap
+      state: absent
+    with_items:
+      - swap
+      - none
+
+  - name: Disable swap
+    command: swapoff -a
+    when: ansible_swaptotal_mb > 0
+
+  - name: Add an apt signing key for Kubernetes
+    apt_key:
+      url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
+      state: present
+
+  - name: Adding apt repository for Kubernetes
+    apt_repository:
+      repo: deb https://apt.kubernetes.io/ kubernetes-xenial main
+      state: present
+      filename: kubernetes.list
+
+  - name: Install Kubernetes binaries
+    apt:
+      name: "{{ packages }}"
+      state: present
+      update_cache: yes
+    vars:
+      packages:
+        - kubelet
+        - kubeadm
+        - kubectl
+
+  - name: Cree file kubelet
+    ansible.builtin.file:
+      path: /etc/default/kubelet
+      state: touch 
+
+  - name: Configure node ip
+    lineinfile:
+      path: /etc/default/kubelet
+      line: KUBELET_EXTRA_ARGS=--node-ip={{ node_ip }}
+      create: yes
+
+  - name: Restart kubelet
+    service:
+      name: kubelet
+      daemon_reload: yes
+      state: restarted
+
+        #  - name:  nettoie config.toml 
+        #    file: 
+        #      path: /etc/containerd/config.toml
+        #      state: absent
+
+  - name:  redemarre containerd 
+    service:
+      name: containerd
+      state: restarted
+

k8s/kubernetes-setup/master-playbook.yml

@@ -2,144 +2,7 @@
 - hosts: all
   become: true
   tasks:
-  - name: Set timezone to Europe/Paris
-    community.general.timezone:
-     name: Europe/Paris
-
-  - name: maj fichier hosts  
-    ansible.builtin.blockinfile:
-      path: /etc/hosts
-      block: |
-        192.168.56.10 k8s-master
-        192.168.56.11 node-1
-        192.168.56.12 node-2
-
-  - name: Forwarding IPv4 and letting iptables see bridged traffic
-    ansible.builtin.blockinfile:
-      path: /etc/modules-load.d/k8s.conf
-      create: yes
-      block: |
-        overlay
-        br_netfilter
- 
-  - name: charge module overlay 
-    community.general.modprobe:
-      state: present
-      name: overlay
-  
-  - name: charge module overlay et br_netfilter
-    community.general.modprobe:
-      state: present
-      name: br_netfilter
- 
-  - name: persistance des bridges
-    ansible.builtin.blockinfile:
-      path: /etc/sysctl.d/k8s.conf
-      create: yes
-      block: |
-        net.bridge.bridge-nf-call-iptables  = 1
-        net.bridge.bridge-nf-call-ip6tables = 1
-        net.ipv4.ip_forward                 = 1
-
-  - name: applique les parametres sysctl
-    command: "sysctl --system"
-  
-  - name: Recupere get-docker
-    get_url: 
-      url: "https://get.docker.com"
-      dest: /tmp/get-docker.sh
-
-  - name: lance get-docker - installe docker, containerd ... 
-    command: 'sh /tmp/get-docker.sh'
-
-  - name: Add vagrant user to docker group
-    user:
-      name: vagrant
-      group: docker
-
-  - name: cree repertoire /etc/containerd
-    file:
-      path: /etc/containerd
-      state: directory  
-
-  - name: genere config.toml (containerd)
-    #command: "sudo containerd config default | sudo tee /etc/containerd/config.toml"
-    shell: "containerd config default | tee /etc/containerd/config.toml"
-
-  - name: configure cgroup driver pour systemd (config.toml)
-    replace:
-      path: "/etc/containerd/config.toml"
-      regexp:  'SystemdCgroup = false'
-      replace: 'SystemdCgroup = true'  
-      backup: yes
-
-  - name: redemarre containerd
-    service:
-      name: containerd
-      state: restarted
-      enabled: yes
-
-  - name: Remove swapfile from /etc/fstab
-    mount:
-      name: "{{ item }}"
-      fstype: swap
-      state: absent
-    with_items:
-      - swap
-      - none
-
-  - name: Disable swap
-    command: swapoff -a
-    when: ansible_swaptotal_mb > 0
-
-  - name: Add an apt signing key for Kubernetes
-    apt_key:
-      url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
-      state: present
-
-  - name: Adding apt repository for Kubernetes
-    apt_repository:
-      repo: deb https://apt.kubernetes.io/ kubernetes-xenial main
-      state: present
-      filename: kubernetes.list
-
-  - name: Install Kubernetes binaries
-    apt:
-      name: "{{ packages }}"
-      state: present
-      update_cache: yes
-    vars:
-      packages:
-        - kubelet
-        - kubeadm
-        - kubectl
-
-  - name: Cree file kubelet
-    ansible.builtin.file:
-      path: /etc/default/kubelet
-      state: touch 
-
-  - name: Configure node ip
-    lineinfile:
-      path: /etc/default/kubelet
-      line: KUBELET_EXTRA_ARGS=--node-ip={{ node_ip }}
-      create: yes
-
-  - name: Restart kubelet
-    service:
-      name: kubelet
-      daemon_reload: yes
-      state: restarted
-
-        #  - name:  nettoie config.toml 
-        #    file: 
-        #      path: /etc/containerd/config.toml
-        #      state: absent
-
-  - name:  redemarre containerd 
-    service:
-      name: containerd
-      state: restarted
+  - include_tasks: common.yml
 
   - name: Initialize the Kubernetes cluster using kubeadm
     command: kubeadm init --apiserver-advertise-address="{{ node_ip }}" --apiserver-cert-extra-sans="{{ node_ip }}"  --node-name k8s-master --pod-network-cidr=192.168.0.0/16
@@ -153,9 +16,6 @@
 
   - name: Install calico pod network
     become: false
-      #command: kubectl create -f https://docs.projectcalico.org/v3.24.5/getting-started/kubernetes/installation/hosted/calico.yaml
-#    command: kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.24.5/manifests/custom-resources.yaml
-#    command: "kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.24.5/manifests/tigera-operator.yaml"
     command: "kubectl create -f https://docs.projectcalico.org/manifests/calico-typha.yaml"
 
   - name: Generate join command
@@ -163,6 +23,7 @@
     register: join_command
 
   - name: Copy join command to local file
+    become: false
     local_action: copy content="{{ join_command.stdout_lines[0] }}" dest="./join-command"
 
   handlers:

k8s/kubernetes-setup/node-playbook.yml

@@ -2,139 +2,7 @@
 - hosts: all
   become: true
   tasks:
-  - name: Set timezone to Europe/Paris
-    community.general.timezone:
-      name: Europe/Paris
-
-  - name: maj fichier hosts  
-    ansible.builtin.blockinfile:
-      path: /etc/hosts
-      block: |
-        192.168.56.10 k8s-master
-        192.168.56.11 node-1
-        192.168.56.12 node-2
-
-  - name: Forwarding IPv4 and letting iptables see bridged traffic
-    ansible.builtin.blockinfile:
-      path: /etc/modules-load.d/k8s.conf
-      create: yes
-      block: |
-        overlay
-        br_netfilter
- 
-  - name: charge module overlay 
-    community.general.modprobe:
-      state: present
-      name: overlay
-  
-  - name: charge module overlay et br_netfilter
-    community.general.modprobe:
-      state: present
-      name: br_netfilter
- 
-  - name: persistance des bridges
-    ansible.builtin.blockinfile:
-      path: /etc/sysctl.d/k8s.conf
-      create: yes
-      block: |
-        net.bridge.bridge-nf-call-iptables  = 1
-        net.bridge.bridge-nf-call-ip6tables = 1
-        net.ipv4.ip_forward                 = 1
-
-  - name: applique les parametres sysctl
-    command: "sysctl --system"
-  
-  - name: Recupere get-docker
-    get_url: 
-      url: "https://get.docker.com"
-      dest: /tmp/get-docker.sh
-
-  - name: lance get-docker - installe docker, containerd ... 
-    command: 'sh /tmp/get-docker.sh'
-
-  - name: Add vagrant user to docker group
-    user:
-      name: vagrant
-      group: docker
-
-  - name: cree repertoire /etc/containerd
-    file:
-      path: /etc/containerd
-      state: directory  
-
-  - name: genere config.toml (containerd)
-    #command: "sudo containerd config default | sudo tee /etc/containerd/config.toml"
-    shell: "containerd config default | tee /etc/containerd/config.toml"
-
-  - name: configure cgroup driver pour systemd (config.toml)
-    replace:
-      path: "/etc/containerd/config.toml"
-      regexp:  'SystemdCgroup = false'
-      replace: 'SystemdCgroup = true'  
-      backup: yes
-
-  - name: redemarre containerd
-    service:
-      name: containerd
-      state: restarted
-      enabled: yes
-
-  - name: Remove swapfile from /etc/fstab
-    mount:
-      name: "{{ item }}"
-      fstype: swap
-      state: absent
-    with_items:
-      - swap
-      - none
-
-  - name: Disable swap
-    command: swapoff -a
-    when: ansible_swaptotal_mb > 0
-
-  - name: Add an apt signing key for Kubernetes
-    apt_key:
-      url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
-      state: present
-
-  - name: Adding apt repository for Kubernetes
-    apt_repository:
-      repo: deb https://apt.kubernetes.io/ kubernetes-xenial main
-      state: present
-      filename: kubernetes.list
-
-  - name: Install Kubernetes binaries
-    apt:
-      name: "{{ packages }}"
-      state: present
-      update_cache: yes
-    vars:
-      packages:
-        - kubelet
-        - kubeadm
-        - kubectl
-
-  - name: Cree file kubelet
-    ansible.builtin.file:
-      path: /etc/default/kubelet
-      state: touch 
-
-  - name: Configure node ip
-    lineinfile:
-      path: /etc/default/kubelet
-      line: KUBELET_EXTRA_ARGS=--node-ip={{ node_ip }}
-      create: yes
-
-  - name: Restart kubelet
-    service:
-      name: kubelet
-      daemon_reload: yes
-      state: restarted
-
-  - name:  redemarre containerd 
-    service:
-      name: containerd
-      state: restarted
+  - include_tasks: common.yml
 
   - name: Copy the join command to server location
     copy: 

salut

@@ -0,0 +1 @@
+salut