diff --git "a/5 NGINX\346\225\217\346\215\267\351\205\215\347\275\256/README.md" "b/5 NGINX\346\225\217\346\215\267\351\205\215\347\275\256/README.md" index 5484746f56e4ff4d0f16e7d14379ceab8d4a6767..0d9012af8457a63142e4be51feb100b4e74d3f4c 100644 --- "a/5 NGINX\346\225\217\346\215\267\351\205\215\347\275\256/README.md" +++ "b/5 NGINX\346\225\217\346\215\267\351\205\215\347\275\256/README.md" @@ -32,13 +32,13 @@ NGINX安装目录为/etc/nginx/,所有实验配置文件均保存在/etc/nginx 2. 访问http://variable.will.com:8080/noset 和 http://variable.will.com:8080/set ,观察返回的页面信息。 3. 删除 *variable.conf* 中第4行的注释符 - ``` + ```conf set $f5 "is the best ADC!"; ``` 重复第1、2步。 4. 在 *variable.conf* 中第11行增加注释符 - ``` + ```conf #set $f5 "NGINX is a part of F5"; ``` 重复第1步。 diff --git a/8 NGINX-Ingress-Controller/9-app-protect/README.md b/8 NGINX-Ingress-Controller/9-app-protect/README.md index a79e34aff5ed19de31887ebe8f25f6abdeeccdd1..427e7a7f8e75b4d74476639ace5683aa7147f6aa 100644 --- a/8 NGINX-Ingress-Controller/9-app-protect/README.md +++ b/8 NGINX-Ingress-Controller/9-app-protect/README.md @@ -51,7 +51,7 @@ $ kubectl apply -f vs-waf.yaml ``` kubectl exec -it ’syslog-pod-name‘ -- tail /var/log/messages | grep ’suppor ID‘ ``` - 其中*s’yslog-pod-name‘*替换为syslog pod的name,*’support ID‘*替换为刚才复制的support ID。 + 其中*syslog-pod-name*替换为syslog pod的name,*support ID*替换为刚才复制的support ID。 ## Step 8 - 还原实验环境 diff --git a/8 NGINX-Ingress-Controller/deployment/nginx-plus-ingress-hostnetwork.yaml b/8 NGINX-Ingress-Controller/deployment/nginx-plus-ingress-hostnetwork.yaml deleted file mode 100644 index 365097d87d45370c4812ea371d2f684ac778388b..0000000000000000000000000000000000000000 --- a/8 NGINX-Ingress-Controller/deployment/nginx-plus-ingress-hostnetwork.yaml +++ /dev/null @@ -1,75 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx-ingress - namespace: nginx-ingress -spec: - replicas: 1 - selector: - matchLabels: - app: nginx-ingress - template: - metadata: - labels: - app: nginx-ingress - #annotations: - #prometheus.io/scrape: "true" - #prometheus.io/port: "9113" - #prometheus.io/scheme: http - spec: - serviceAccountName: nginx-ingress - hostNetwork: true - nodeSelector: - name: master - containers: - - image: docker-registry.nginx.com/nginx-ic-nap/nginx-plus-ingress:1.12.0 - imagePullPolicy: Never - name: nginx-plus-ingress - ports: - - name: http - containerPort: 80 - - name: https - containerPort: 443 - - name: readiness-port - containerPort: 8081 - - name: dashboard - containerPort: 8080 - #- name: prometheus - # containerPort: 9113 - readinessProbe: - httpGet: - path: /nginx-ready - port: readiness-port - periodSeconds: 1 - securityContext: - allowPrivilegeEscalation: true - runAsUser: 101 #nginx - capabilities: - drop: - - ALL - add: - - NET_BIND_SERVICE - env: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - args: - - -nginx-plus - - -nginx-configmaps=$(POD_NAMESPACE)/nginx-config - - -default-server-tls-secret=$(POD_NAMESPACE)/default-server-secret - - -enable-app-protect - #- -v=3 # Enables extensive logging. Useful for troubleshooting. - - -report-ingress-status - #- -external-service=nginx-ingress - #- -enable-prometheus-metrics - - -global-configuration=$(POD_NAMESPACE)/nginx-configuration - - -ingress-class=nginx-plus - - -enable-tls-passthrough - - -nginx-status-allow-cidrs=10.1.10.0/24 - - -enable-preview-policies - - -health-status \ No newline at end of file