From 3e6e4dedcdf5db862ebaaa9b5efc5990459533b3 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Mon, 26 Oct 2020 17:35:08 +0100
Subject: Fixing metallb on linux

---
 srcs/m/Dockerfile            |  14 -----
 srcs/m/entrypoint.sh         |  15 -----
 srcs/m/my.cnf                |   5 --
 srcs/m/mysql.yaml            |  60 --------------------
 srcs/metallb-config.yaml     |   3 +-
 srcs/mysql/Dockerfile        |  28 +++++----
 srcs/mysql/entrypoint.sh     |  37 ++++++++++++
 srcs/mysql/my.cnf            | 132 ++-----------------------------------------
 srcs/mysql/mysql.yaml        |   5 +-
 srcs/mysql/start.sh          |  10 ----
 srcs/nginx/src/entrypoint.sh |   1 -
 11 files changed, 60 insertions(+), 250 deletions(-)
 delete mode 100644 srcs/m/Dockerfile
 delete mode 100755 srcs/m/entrypoint.sh
 delete mode 100644 srcs/m/my.cnf
 delete mode 100644 srcs/m/mysql.yaml
 create mode 100755 srcs/mysql/entrypoint.sh
 delete mode 100755 srcs/mysql/start.sh

(limited to 'srcs')

diff --git a/srcs/m/Dockerfile b/srcs/m/Dockerfile
deleted file mode 100644
index e66095e..0000000
--- a/srcs/m/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM alpine
-
-RUN apk update && \
-    apk upgrade && \
-	apk add mysql mysql-client --no-cache
-
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-COPY my.cnf /etc/mysql/my.cnf
-
-EXPOSE 3306
-
-CMD ["/entrypoint.sh"]
diff --git a/srcs/m/entrypoint.sh b/srcs/m/entrypoint.sh
deleted file mode 100755
index ab9a3d9..0000000
--- a/srcs/m/entrypoint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-mkdir -p /run/mysqld
-mkdir -p /var/lib/mysql
-
-mysql_install_db --user=root --datadir=/var/lib/mysql > /dev/null
-
-/usr/bin/mysqld --user=root --datadir=/var/lib/mysql --bootstrap <<EOF
-CREATE DATABASE wordpressdb;
-CREATE USER 'wordpressuser'@'%' IDENTIFIED BY 'wordpresspass';
-GRANT ALL PRIVILEGES ON wordpressdb.* TO 'wordpressuser'@'%' IDENTIFIED BY 'wordpresspass';
-FLUSH PRIVILEGES;
-EOF
-
-exec /usr/bin/mysqld --user=root --datadir=/var/lib/mysql
diff --git a/srcs/m/my.cnf b/srcs/m/my.cnf
deleted file mode 100644
index 4f5e2c6..0000000
--- a/srcs/m/my.cnf
+++ /dev/null
@@ -1,5 +0,0 @@
-[mysqld]
-user = root
-port = 3306
-datadir = /var/lib/mysql
-log-bin = /var/lib/mysql/mysql-bin
diff --git a/srcs/m/mysql.yaml b/srcs/m/mysql.yaml
deleted file mode 100644
index ead25b4..0000000
--- a/srcs/m/mysql.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mysql-deployment
-  labels:
-    app: mysql
-spec:
-  selector:
-    matchLabels:
-      app: mysql
-  replicas: 1
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-  template:
-    metadata:
-      labels:
-        app: mysql
-    spec:
-      containers:
-        - image: cacharle-mysql
-          imagePullPolicy: Never
-          name: cacharle-mysql-container
-      #     volumeMounts:
-      #       - name: mysql-volume
-      #         mountPath: /var/lib/data
-      # volumes:
-      #   - name: mysql-volume
-      #     persistentVolumeClaim:
-      #       claimName: mysql-volume
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: mysql-service
-spec:
-  type: LoadBalancer
-  ports:
-    - name: mysql
-      port: 3306
-      targetPort: 3306
-  selector:
-    app: mysql
-
-# ---
-#
-# apiVersion: v1
-# kind: PersistentVolumeClaim
-# metadata:
-#   name: mysql-volume
-#   labels:
-#     app: mysql
-# spec:
-#   accessModes:
-#     - ReadWriteOnce  # read/write by one pod
-#   resources:
-#     requests:
-#       storage: 1Gi
diff --git a/srcs/metallb-config.yaml b/srcs/metallb-config.yaml
index a9f5928..9c15c6c 100644
--- a/srcs/metallb-config.yaml
+++ b/srcs/metallb-config.yaml
@@ -9,4 +9,5 @@ data:
     - name: default
       protocol: layer2
       addresses:
-      - 192.168.99.230-192.168.99.250
+        # - IPex-Ipex
+        - 192.168.99.230-192.168.99.250
diff --git a/srcs/mysql/Dockerfile b/srcs/mysql/Dockerfile
index 448080e..5f36a6c 100644
--- a/srcs/mysql/Dockerfile
+++ b/srcs/mysql/Dockerfile
@@ -1,16 +1,14 @@
-FROM alpine:latest
-#init
-RUN apk -U upgrade
-#install nginx/php
-RUN apk add vim mysql mysql-client
-# RUN apk add telegraf --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted --no-cache
-#Expose PORT
+FROM alpine
+
+RUN apk update && \
+    apk upgrade && \
+	apk add mysql mysql-client --no-cache
+
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+# COPY my.cnf /etc/my.cnf.d/ft_services.cnf
+
 EXPOSE 3306
-COPY my.cnf /etc/
-COPY start.sh .
-#COPY wordpress .
-# COPY init.sql .
-#telegraf
-# RUN mkdir -p /etc/telegraf
-# COPY telegraf.conf /etc/telegraf/telegraf.conf
-CMD /bin/sh /start.sh
+
+CMD ["/entrypoint.sh"]
diff --git a/srcs/mysql/entrypoint.sh b/srcs/mysql/entrypoint.sh
new file mode 100755
index 0000000..07493b6
--- /dev/null
+++ b/srcs/mysql/entrypoint.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# mkdir -p /run/mysqld
+# mkdir -p /var/lib/mysql
+#
+# mysql_install_db --user=root --datadir=/var/lib/mysql > /dev/null
+#
+# /usr/bin/mysqld --user=root --datadir=/var/lib/mysql --bootstrap <<EOF
+# CREATE DATABASE wordpress;
+# CREATE USER 'root'@'%' IDENTIFIED BY 'root';
+# GRANT ALL PRIVILEGES ON wordpress.* TO 'root'@'%' IDENTIFIED BY 'root';
+# FLUSH PRIVILEGES;
+# EOF
+#
+# sleep 5
+#
+# sed -i "s|.*bind-address\s*=.*|bind-address=0.0.0.0|g" /etc/my.cnf.d/mariadb-server.cnf
+#
+# exec /usr/bin/mysqld --user=root --datadir=/var/lib/mysql
+
+mkdir -p /run/mysqld
+mkdir -p /var/lib/mysql
+
+mysql_install_db --user=root > /dev/null
+
+/usr/bin/mysqld --user=root --bootstrap <<EOF
+CREATE DATABASE wordpress;
+CREATE USER 'root'@'%' IDENTIFIED BY 'root';
+GRANT ALL PRIVILEGES ON wordpress.* TO 'root'@'%' IDENTIFIED BY 'root';
+FLUSH PRIVILEGES;
+EOF
+
+sleep 5
+
+sed -i "s|.*bind-address\s*=.*|bind-address=0.0.0.0|g" /etc/my.cnf.d/mariadb-server.cnf
+
+exec /usr/bin/mysqld --user=root
diff --git a/srcs/mysql/my.cnf b/srcs/mysql/my.cnf
index a366ea4..4f5e2c6 100644
--- a/srcs/mysql/my.cnf
+++ b/srcs/mysql/my.cnf
@@ -1,129 +1,5 @@
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port        = 3306
-socket      = /var/run/mysqld/mysqld.sock
-default-character-set = utf8mb4
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket      = /var/run/mysqld/mysqld.sock
-nice        = 0
-
 [mysqld]
-#
-# * Basic Settings
-#
-user        = mysql
-pid-file    = /var/run/mysqld/mysqld.pid
-socket      = /var/run/mysqld/mysqld.sock
-port        = 3306
-basedir     = /usr
-datadir     = /var/lib/mysql
-tmpdir      = /tmp
-lc-messages-dir = /usr/share/mysql
-skip-external-locking
-collation_server = utf8mb4_unicode_ci
-character_set_server = utf8mb4
-bind-address            = 0.0.0.0
-
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#
-# * Fine Tuning
-#
-key_buffer      = 16M
-max_allowed_packet  = 16M
-thread_stack        = 192K
-thread_cache_size       = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover         = BACKUP
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-#
-# * Query Cache Configuration
-#
-query_cache_limit   = 1M
-query_cache_size        = 16M
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /var/log/mysql/mysql.log
-#general_log             = 1
-#
-# Error log - should be very few entries.
-#
-# log_error = /var/log/mysql/error.log
-#
-# Here you can see queries with especially long duration
-#log_slow_queries   = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id      = 1
-#log_bin            = /var/log/mysql/mysql-bin.log
-expire_logs_days    = 10
-max_binlog_size         = 100M
-#binlog_do_db       = include_database_name
-#binlog_ignore_db   = include_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet  = 16M
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completion
-default-character-set = utf8mb4
-[isamchk]
-key_buffer      = 16M
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
+user = root
+port = 3306
+datadir = /var/lib/mysql
+log-bin = /var/lib/mysql/mysql-bin
diff --git a/srcs/mysql/mysql.yaml b/srcs/mysql/mysql.yaml
index ead25b4..17ba1e8 100644
--- a/srcs/mysql/mysql.yaml
+++ b/srcs/mysql/mysql.yaml
@@ -35,8 +35,11 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mysql-service
+  labels:
+    app: mysql
 spec:
-  type: LoadBalancer
+  type: ClusterIP
+  # clusterIP: None
   ports:
     - name: mysql
       port: 3306
diff --git a/srcs/mysql/start.sh b/srcs/mysql/start.sh
deleted file mode 100755
index bee0298..0000000
--- a/srcs/mysql/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-mysql_install_db --user=root --ldata=/var/lib/mysql
-cat > /tmp/sql << eof
-CREATE DATABASE wordpress;
-FLUSH PRIVILEGES;
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;
-FLUSH PRIVILEGES;
-eof
-/usr/bin/mysqld --console --init_file=/tmp/sql
diff --git a/srcs/nginx/src/entrypoint.sh b/srcs/nginx/src/entrypoint.sh
index 07719af..bfef63c 100755
--- a/srcs/nginx/src/entrypoint.sh
+++ b/srcs/nginx/src/entrypoint.sh
@@ -2,7 +2,6 @@
 
 echo 'root:password' | chpasswd
 echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config
-# echo 'Port 30022' >> /etc/ssh/sshd_config
 
 openrc
 touch /run/openrc/softlevel
-- 
cgit