diff --git a/deletesh.sh b/deletesh.sh index fd4c3fc..4bc00d9 100755 --- a/deletesh.sh +++ b/deletesh.sh @@ -10,4 +10,7 @@ kubectl delete deployment wp kubectl delete deployment phpmyadmin-deployment kubectl delete deployment ftps kubectl delete pods --all +# eval $(minikube docker-env) +# docker stop $(docker ps -a -q) +# docker rm $(docker ps -a -q) kubectl delete pv --all \ No newline at end of file diff --git a/srcs/.DS_Store b/srcs/.DS_Store index 9aef938..54bcd54 100644 Binary files a/srcs/.DS_Store and b/srcs/.DS_Store differ diff --git a/srcs/ftps/srcs/vsftpd.conf b/srcs/ftps/srcs/vsftpd.conf index 78f8318..054ed58 100644 --- a/srcs/ftps/srcs/vsftpd.conf +++ b/srcs/ftps/srcs/vsftpd.conf @@ -11,6 +11,6 @@ seccomp_sandbox=NO rsa_cert_file=/etc/ssl/certs/vsftpd.crt rsa_private_key_file=/etc/ssl/private/vsftpd.key ssl_enable=YES -pasv_address=192.168.99.100 +pasv_address=192.168.99.150 pasv_min_port=30020 pasv_max_port=30021 \ No newline at end of file diff --git a/srcs/mariadb/wp_db.sql b/srcs/mariadb/wp_db.sql index b772fff..225ca4a 100644 --- a/srcs/mariadb/wp_db.sql +++ b/srcs/mariadb/wp_db.sql @@ -1,27 +1,27 @@ -CREATE TABLE `wp_users` ( - `ID` bigint(20) UNSIGNED NOT NULL, - `user_login` varchar(60) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', - `user_pass` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', - `user_nicename` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', - `user_email` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', - `user_url` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', - `user_registered` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `user_activation_key` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', - `user_status` int(11) NOT NULL DEFAULT 0, - `display_name` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +-- CREATE TABLE `wp_users` ( +-- `ID` bigint(20) UNSIGNED NOT NULL, +-- `user_login` varchar(60) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', +-- `user_pass` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', +-- `user_nicename` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', +-- `user_email` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', +-- `user_url` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', +-- `user_registered` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +-- `user_activation_key` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', +-- `user_status` int(11) NOT NULL DEFAULT 0, +-- `display_name` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' +-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -INSERT INTO `wp_users` (`ID`, `user_login`, `user_pass`, `user_nicename`, `user_email`, `user_url`, `user_registered`, `user_activation_key`, `user_status`, `display_name`) VALUES -(2, 'user1', '$P$BQhf7VLeZ4N7bPw.CLFQemRW56viCz/', 'user1', 'user1@user1.user1', '', '2020-11-15 12:07:56', '', 0, 'user1'), -(3, 'user2', '$P$BxtMNMYRgoavR4TSdtT3IZg7W4PF5j1', 'user2', 'user2@user2.user2', '', '2020-11-15 12:08:27', '', 0, 'user2'), -(4, 'user3', '$P$Bx7PM/YyrBNrNGBXOT7MBZ/RAIyOGb.', 'user3', 'user3@user3.user3', '', '2020-11-15 12:08:50', '', 0, 'user3'); +-- INSERT INTO `wp_users` (`ID`, `user_login`, `user_pass`, `user_nicename`, `user_email`, `user_url`, `user_registered`, `user_activation_key`, `user_status`, `display_name`) VALUES +-- (2, 'user1', '$P$BQhf7VLeZ4N7bPw.CLFQemRW56viCz/', 'user1', 'user1@user1.user1', '', '2020-11-15 12:07:56', '', 0, 'user1'), +-- (3, 'user2', '$P$BxtMNMYRgoavR4TSdtT3IZg7W4PF5j1', 'user2', 'user2@user2.user2', '', '2020-11-15 12:08:27', '', 0, 'user2'), +-- (4, 'user3', '$P$Bx7PM/YyrBNrNGBXOT7MBZ/RAIyOGb.', 'user3', 'user3@user3.user3', '', '2020-11-15 12:08:50', '', 0, 'user3'); -ALTER TABLE `wp_users` - ADD PRIMARY KEY (`ID`), - ADD KEY `user_login_key` (`user_login`), - ADD KEY `user_nicename` (`user_nicename`), - ADD KEY `user_email` (`user_email`); +-- ALTER TABLE `wp_users` +-- ADD PRIMARY KEY (`ID`), +-- ADD KEY `user_login_key` (`user_login`), +-- ADD KEY `user_nicename` (`user_nicename`), +-- ADD KEY `user_email` (`user_email`); -ALTER TABLE `wp_users` - MODIFY `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5; -COMMIT; \ No newline at end of file +-- ALTER TABLE `wp_users` +-- MODIFY `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5; +-- COMMIT; \ No newline at end of file diff --git a/srcs/wp/Dockerfile b/srcs/wp/Dockerfile index 06b16a2..61bf2dd 100755 --- a/srcs/wp/Dockerfile +++ b/srcs/wp/Dockerfile @@ -1,5 +1,4 @@ FROM alpine:3.12 -LABEL maintainer="mdenys" RUN apk update RUN apk add curl supervisor nginx php7 php7-fpm php7-phar php7-opcache php7-gd php7-mysqli php7-zlib php7-curl php7-mbstring php7-json php7-session mariadb mariadb-client openrc RUN mkdir "/run/mysqld" && chown -R mysql /run/mysqld @@ -9,7 +8,11 @@ RUN mkdir -p /run/nginx COPY nginx.conf /etc/nginx/conf.d/default.conf COPY supervisord.conf /etc/supervisord.conf COPY start.sh . +COPY wp-cli.phar . +RUN chmod +x wp-cli.phar +RUN mv wp-cli.phar /usr/local/bin/wp RUN chmod +x start.sh EXPOSE 5050 -CMD ["/start.sh"] -CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] +VOLUME [ "/var/www/localhost/htdocs/" ] +ENTRYPOINT ["/bin/sh", "/start.sh"] +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] \ No newline at end of file diff --git a/srcs/wp/start.sh b/srcs/wp/start.sh index 0798fc2..d0cc8ca 100644 --- a/srcs/wp/start.sh +++ b/srcs/wp/start.sh @@ -2,11 +2,8 @@ openrc default /etc/init.d/mariadb setup rc-service mariadb start -/usr/bin/mysqld_safe & -# curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -# chmod +x wp-cli.phar -# mv wp-cli.phar /usr/local/bin/wp -# cd /var/www/localhost/htdocs/ -# wp core download --allow-root -# wp core config --allow-root --dbname=wp_db --dbuser=mdenys --dbpass=mdenys --dbhost=mariadb-service:3306 --dbprefix=wp_ -# wp core install --allow-root --url="localhost" --title="ecole 21" --admin_user="admin" --admin_password="123456" --admin_email="denis.nadey@gmail.com" \ No newline at end of file +cd /var/www/localhost/htdocs/ +wp core download --allow-root +wp core config --allow-root --dbname=wp_db --dbuser=mdenys --dbpass=mdenys --dbhost=mariadb-service --dbprefix=wp_ +wp core install --allow-root --url="http://192.168.99.150:5050" --title="ecole 21" --admin_user="admin" --admin_password="123456" --admin_email="denis.nadey@gmail.com" +/usr/bin/supervisord -c /etc/supervisord.conf \ No newline at end of file diff --git a/srcs/wp/wp-cli.phar b/srcs/wp/wp-cli.phar new file mode 100644 index 0000000..137e383 Binary files /dev/null and b/srcs/wp/wp-cli.phar differ diff --git a/srcs/yaml/ftps.yaml b/srcs/yaml/ftps.yaml index 5e6b318..7bb0516 100644 --- a/srcs/yaml/ftps.yaml +++ b/srcs/yaml/ftps.yaml @@ -10,19 +10,15 @@ spec: ports: - name: data port: 20 - targetPort: 20 - name: ftps port: 21 protocol: TCP - targetPort: 21 - name: ftps-pasv20 port: 30020 protocol: TCP - targetPort: 30020 - name: ftps-pasv port: 30021 protocol: TCP - targetPort: 30021 selector: app: ftps type: LoadBalancer diff --git a/srcs/yaml/mariadb.yaml b/srcs/yaml/mariadb.yaml index b30f429..5cce388 100644 --- a/srcs/yaml/mariadb.yaml +++ b/srcs/yaml/mariadb.yaml @@ -31,10 +31,6 @@ spec: containers: - name: mariadb-container image: mariadb-image - resources: - limits: - memory: "128Mi" - cpu: "100m" imagePullPolicy: Never ports: - containerPort: 3306 @@ -53,7 +49,7 @@ metadata: labels: type: local spec: - storageClassName: manual + storageClassName: fast capacity: storage: 500Mi accessModes: diff --git a/srcs/yaml/metallb.yaml b/srcs/yaml/metallb.yaml index d6156e7..4de9d67 100755 --- a/srcs/yaml/metallb.yaml +++ b/srcs/yaml/metallb.yaml @@ -9,4 +9,4 @@ data: - name: default protocol: layer2 addresses: - - 192.168.99.100-192.168.99.200 \ No newline at end of file + - 192.168.99.150-192.168.99.200 \ No newline at end of file diff --git a/srcs/yaml/phpsvc.yaml b/srcs/yaml/phpsvc.yaml index f5b9fb9..f4f28e2 100755 --- a/srcs/yaml/phpsvc.yaml +++ b/srcs/yaml/phpsvc.yaml @@ -30,9 +30,5 @@ spec: - name: phpmyadmin imagePullPolicy: Never image: phpmyadmin_image - resources: - limits: - memory: "128Mi" - cpu: "50m" ports: - containerPort: 5000 \ No newline at end of file diff --git a/srcs/yaml/wp.yaml b/srcs/yaml/wp.yaml index 694e360..506cbd9 100644 --- a/srcs/yaml/wp.yaml +++ b/srcs/yaml/wp.yaml @@ -2,10 +2,12 @@ apiVersion: v1 kind: Service metadata: name: wp-service + annotations: + metallb.universe.tf/allow-shared-ip: minikube labels: app: wp spec: - type: ClusterIP + type: LoadBalancer ports: - port: 5050 name: wp @@ -31,10 +33,6 @@ spec: containers: - name: wp-container image: wp-image - resources: - limits: - memory: "128Mi" - cpu: "100m" imagePullPolicy: Never ports: - containerPort: 5050 @@ -53,7 +51,7 @@ metadata: labels: type: local spec: - storageClassName: manual + storageClassName: fast capacity: storage: 500Mi accessModes: